annotate src/buffer.c @ 18297:5c8e37591da5

(quail-current-data): New variable. (quail-use-package): Do not reload a package already loaded. (quail-define-package): Update TITLE field of input-method-alist. (quail-map-p): TRANSLATION may be a cons. (quail-define-rules): Add autoload cookie. (quail-defrule): Add autoload cookie. Handle the case that TRANS is a cons. (quail-get-translation, quail-lookup-key, quail-translate-key, quail-show-translations, quail-completion-list-translations, quail-show-kbd-layout): Likewise. (quail-hide-guidance-buf): Check if window WIN exists before deleting it. (quail-directory-name): New variable. (quail-update-leim-list-file): New function.
author Kenichi Handa <handa@m17n.org>
date Wed, 18 Jun 1997 12:55:07 +0000
parents b45b431879bf
children 9f5626727351
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1 /* Buffer manipulation primitives for GNU Emacs.
17220
08906793cec3 Change copyright year.
Richard M. Stallman <rms@gnu.org>
parents: 17218
diff changeset
2 Copyright (C) 1985, 1986, 1987, 1988, 1989, 1993, 1994, 1995, 1997
1953
714df59790af (Ferase_buffer): Added interactive spec.
Roland McGrath <roland@gnu.org>
parents: 1952
diff changeset
3 Free Software Foundation, Inc.
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
4
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5 This file is part of GNU Emacs.
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
6
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
7 GNU Emacs is free software; you can redistribute it and/or modify
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
8 it under the terms of the GNU General Public License as published by
1953
714df59790af (Ferase_buffer): Added interactive spec.
Roland McGrath <roland@gnu.org>
parents: 1952
diff changeset
9 the Free Software Foundation; either version 2, or (at your option)
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
10 any later version.
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
11
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
12 GNU Emacs is distributed in the hope that it will be useful,
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
13 but WITHOUT ANY WARRANTY; without even the implied warranty of
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
15 GNU General Public License for more details.
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
16
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
17 You should have received a copy of the GNU General Public License
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
18 along with GNU Emacs; see the file COPYING. If not, write to
14186
ee40177f6c68 Update FSF's address in the preamble.
Erik Naggum <erik@naggum.no>
parents: 14060
diff changeset
19 the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
ee40177f6c68 Update FSF's address in the preamble.
Erik Naggum <erik@naggum.no>
parents: 14060
diff changeset
20 Boston, MA 02111-1307, USA. */
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
21
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
22
1563
e721339972b0 * buffer.c (init_buffer): If PWD is accurate, use it instead of
Jim Blandy <jimb@redhat.com>
parents: 1501
diff changeset
23 #include <sys/types.h>
e721339972b0 * buffer.c (init_buffer): If PWD is accurate, use it instead of
Jim Blandy <jimb@redhat.com>
parents: 1501
diff changeset
24 #include <sys/stat.h>
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
25 #include <sys/param.h>
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
26
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
27 #ifndef MAXPATHLEN
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
28 /* in 4.1, param.h fails to define this. */
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
29 #define MAXPATHLEN 1024
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
30 #endif /* not MAXPATHLEN */
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
31
4696
1fc792473491 Include <config.h> instead of "config.h".
Roland McGrath <roland@gnu.org>
parents: 4574
diff changeset
32 #include <config.h>
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
33 #include "lisp.h"
1308
2660a7053836 * buffer.c: #include intervals.h.
Joseph Arceneaux <jla@gnu.org>
parents: 1291
diff changeset
34 #include "intervals.h"
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
35 #include "window.h"
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
36 #include "commands.h"
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
37 #include "buffer.h"
17022
907fb167f7de Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16840
diff changeset
38 #include "charset.h"
9403
9f797989b817 * buffer.c: #include region-cache.h.
Jim Blandy <jimb@redhat.com>
parents: 9362
diff changeset
39 #include "region-cache.h"
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
40 #include "indent.h"
2480
6f4b9c548425 Include blockinput.h.
Richard M. Stallman <rms@gnu.org>
parents: 2439
diff changeset
41 #include "blockinput.h"
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
42
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
43 struct buffer *current_buffer; /* the current buffer */
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
44
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
45 /* First buffer in chain of all buffers (in reverse order of creation).
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
46 Threaded through ->next. */
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
47
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
48 struct buffer *all_buffers;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
49
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
50 /* This structure holds the default values of the buffer-local variables
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
51 defined with DEFVAR_PER_BUFFER, that have special slots in each buffer.
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
52 The default value occupies the same slot in this structure
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
53 as an individual buffer's value occupies in that buffer.
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
54 Setting the default value also goes through the alist of buffers
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
55 and stores into each buffer that does not say it has a local value. */
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
56
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
57 struct buffer buffer_defaults;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
58
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
59 /* A Lisp_Object pointer to the above, used for staticpro */
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
60
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
61 static Lisp_Object Vbuffer_defaults;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
62
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
63 /* This structure marks which slots in a buffer have corresponding
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
64 default values in buffer_defaults.
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
65 Each such slot has a nonzero value in this structure.
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
66 The value has only one nonzero bit.
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
67
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
68 When a buffer has its own local value for a slot,
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
69 the bit for that slot (found in the same slot in this structure)
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
70 is turned on in the buffer's local_var_flags slot.
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
71
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
72 If a slot in this structure is -1, then even though there may
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
73 be a DEFVAR_PER_BUFFER for the slot, there is no default value for it;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
74 and the corresponding slot in buffer_defaults is not used.
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
75
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
76 If a slot is -2, then there is no DEFVAR_PER_BUFFER for it,
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
77 but there is a default value which is copied into each buffer.
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
78
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
79 If a slot in this structure is negative, then even though there may
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
80 be a DEFVAR_PER_BUFFER for the slot, there is no default value for it;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
81 and the corresponding slot in buffer_defaults is not used.
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
82
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
83 If a slot in this structure corresponding to a DEFVAR_PER_BUFFER is
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
84 zero, that is a bug */
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
85
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
86 struct buffer buffer_local_flags;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
87
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
88 /* This structure holds the names of symbols whose values may be
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
89 buffer-local. It is indexed and accessed in the same way as the above. */
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
90
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
91 struct buffer buffer_local_symbols;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
92 /* A Lisp_Object pointer to the above, used for staticpro */
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
93 static Lisp_Object Vbuffer_local_symbols;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
94
1001
c1ebe69206df * buffer.c (syms_of_buffer): Call DEFVAR_PER_BUFFER with the new
Jim Blandy <jimb@redhat.com>
parents: 764
diff changeset
95 /* 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
96 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
97 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
98 slot contains an integer, then prospective values' tags must be
c1ebe69206df * buffer.c (syms_of_buffer): Call DEFVAR_PER_BUFFER with the new
Jim Blandy <jimb@redhat.com>
parents: 764
diff changeset
99 equal to that integer. When a tag does not match, the function
c1ebe69206df * buffer.c (syms_of_buffer): Call DEFVAR_PER_BUFFER with the new
Jim Blandy <jimb@redhat.com>
parents: 764
diff changeset
100 buffer_slot_type_mismatch will signal an error. */
c1ebe69206df * buffer.c (syms_of_buffer): Call DEFVAR_PER_BUFFER with the new
Jim Blandy <jimb@redhat.com>
parents: 764
diff changeset
101 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
102
15776
6018e01d4466 (buffer_permanent_local_flags): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 15638
diff changeset
103 /* 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
104 are permanent locals. */
6018e01d4466 (buffer_permanent_local_flags): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 15638
diff changeset
105 static int buffer_permanent_local_flags;
6018e01d4466 (buffer_permanent_local_flags): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 15638
diff changeset
106
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
107 Lisp_Object Fset_buffer ();
392
dce611246f59 *** empty log message ***
Roland McGrath <roland@gnu.org>
parents: 333
diff changeset
108 void set_buffer_internal ();
11889
1067ddd12dfc (set_buffer_internal_1): New subroutine.
Karl Heuer <kwzh@gnu.org>
parents: 11838
diff changeset
109 void set_buffer_internal_1 ();
4077
a860278e3ab3 (verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents: 3884
diff changeset
110 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
111 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
112 static void reset_buffer_local_variables ();
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
113
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
114 /* Alist of all buffer names vs the buffers. */
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
115 /* This used to be a variable, but is no longer,
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
116 to prevent lossage due to user rplac'ing this alist or its elements. */
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
117 Lisp_Object Vbuffer_alist;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
118
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
119 /* Functions to call before and after each text change. */
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
120 Lisp_Object Vbefore_change_function;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
121 Lisp_Object Vafter_change_function;
6785
121f2c5eba5e (Vafter_change_functions, Vbefore_change_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 6697
diff changeset
122 Lisp_Object Vbefore_change_functions;
121f2c5eba5e (Vafter_change_functions, Vbefore_change_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 6697
diff changeset
123 Lisp_Object Vafter_change_functions;
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
124
2043
a1ab3501653c (reset_buffer_local_variables): Reset mark_active.
Richard M. Stallman <rms@gnu.org>
parents: 2020
diff changeset
125 Lisp_Object Vtransient_mark_mode;
a1ab3501653c (reset_buffer_local_variables): Reset mark_active.
Richard M. Stallman <rms@gnu.org>
parents: 2020
diff changeset
126
3481
56424e6245c2 (syms_of_buffer): Set up Lisp var inhibit-read-only.
Richard M. Stallman <rms@gnu.org>
parents: 3463
diff changeset
127 /* 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
128 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
129 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
130 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
131
6051
0b144d967f30 (Fkill_buffer): Call the Vkill_buffer_query_functions.
Richard M. Stallman <rms@gnu.org>
parents: 5904
diff changeset
132 /* 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
133 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
134 Lisp_Object Vkill_buffer_query_functions;
0b144d967f30 (Fkill_buffer): Call the Vkill_buffer_query_functions.
Richard M. Stallman <rms@gnu.org>
parents: 5904
diff changeset
135
1821
04fb1d3d6992 JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents: 1707
diff changeset
136 /* 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
137 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
138
1821
04fb1d3d6992 JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents: 1707
diff changeset
139 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
140 Lisp_Object Qbefore_change_functions;
937df231678c (Qbefore_change_functions, Qafter_change_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 12699
diff changeset
141 Lisp_Object Qafter_change_functions;
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
142
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
143 Lisp_Object Qfundamental_mode, Qmode_class, Qpermanent_local;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
144
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
145 Lisp_Object Qprotected_field;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
146
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
147 Lisp_Object QSFundamental; /* A string "Fundamental" */
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
148
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
149 Lisp_Object Qkill_buffer_hook;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
150
5433
7ac1e6f1565f Don't include syntax.h.
Richard M. Stallman <rms@gnu.org>
parents: 5247
diff changeset
151 Lisp_Object Qget_file_buffer;
7ac1e6f1565f Don't include syntax.h.
Richard M. Stallman <rms@gnu.org>
parents: 5247
diff changeset
152
2776
8bf3bb4c20dd * lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents: 2722
diff changeset
153 Lisp_Object Qoverlayp;
8bf3bb4c20dd * lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents: 2722
diff changeset
154
11693
efef31f1c42d (Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents: 11659
diff changeset
155 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
156
4213
616036bb2427 (Qmodification_hooks, Qinsert_in_front_hooks)
Richard M. Stallman <rms@gnu.org>
parents: 4100
diff changeset
157 Lisp_Object Qmodification_hooks;
616036bb2427 (Qmodification_hooks, Qinsert_in_front_hooks)
Richard M. Stallman <rms@gnu.org>
parents: 4100
diff changeset
158 Lisp_Object Qinsert_in_front_hooks;
616036bb2427 (Qmodification_hooks, Qinsert_in_front_hooks)
Richard M. Stallman <rms@gnu.org>
parents: 4100
diff changeset
159 Lisp_Object Qinsert_behind_hooks;
616036bb2427 (Qmodification_hooks, Qinsert_in_front_hooks)
Richard M. Stallman <rms@gnu.org>
parents: 4100
diff changeset
160
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
161 /* For debugging; temporary. See set_buffer_internal. */
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
162 /* Lisp_Object Qlisp_mode, Vcheck_symbol; */
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
163
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
164 nsberror (spec)
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
165 Lisp_Object spec;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
166 {
9146
8f966cc4652b (nsberror, Fget_buffer, Fget_file_buffer, Fbuffer_local_variables,
Karl Heuer <kwzh@gnu.org>
parents: 9047
diff changeset
167 if (STRINGP (spec))
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
168 error ("No buffer named %s", XSTRING (spec)->data);
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
169 error ("Invalid buffer argument");
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
170 }
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
171
14506
bddd8114eaa9 (Fbuffer_live_p): New function.
Richard M. Stallman <rms@gnu.org>
parents: 14481
diff changeset
172 DEFUN ("buffer-live-p", Fbuffer_live_p, Sbuffer_live_p, 1, 1, 0,
bddd8114eaa9 (Fbuffer_live_p): New function.
Richard M. Stallman <rms@gnu.org>
parents: 14481
diff changeset
173 "Return non-nil if OBJECT is a buffer which has not been killed.\n\
bddd8114eaa9 (Fbuffer_live_p): New function.
Richard M. Stallman <rms@gnu.org>
parents: 14481
diff changeset
174 Value is nil if OBJECT is not a buffer or if it has been killed.")
bddd8114eaa9 (Fbuffer_live_p): New function.
Richard M. Stallman <rms@gnu.org>
parents: 14481
diff changeset
175 (object)
bddd8114eaa9 (Fbuffer_live_p): New function.
Richard M. Stallman <rms@gnu.org>
parents: 14481
diff changeset
176 Lisp_Object object;
bddd8114eaa9 (Fbuffer_live_p): New function.
Richard M. Stallman <rms@gnu.org>
parents: 14481
diff changeset
177 {
bddd8114eaa9 (Fbuffer_live_p): New function.
Richard M. Stallman <rms@gnu.org>
parents: 14481
diff changeset
178 return ((BUFFERP (object) && ! NILP (XBUFFER (object)->name))
bddd8114eaa9 (Fbuffer_live_p): New function.
Richard M. Stallman <rms@gnu.org>
parents: 14481
diff changeset
179 ? Qt : Qnil);
bddd8114eaa9 (Fbuffer_live_p): New function.
Richard M. Stallman <rms@gnu.org>
parents: 14481
diff changeset
180 }
bddd8114eaa9 (Fbuffer_live_p): New function.
Richard M. Stallman <rms@gnu.org>
parents: 14481
diff changeset
181
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
182 DEFUN ("buffer-list", Fbuffer_list, Sbuffer_list, 0, 0, 0,
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
183 "Return a list of all existing live buffers.")
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
184 ()
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
185 {
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
186 return Fmapcar (Qcdr, Vbuffer_alist);
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
187 }
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
188
10210
43e95429ffa0 (Fget_buffer_create): Copy the name, and clear text props.
Richard M. Stallman <rms@gnu.org>
parents: 10146
diff changeset
189 /* 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
190 (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
191 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
192
43e95429ffa0 (Fget_buffer_create): Copy the name, and clear text props.
Richard M. Stallman <rms@gnu.org>
parents: 10146
diff changeset
193 static Lisp_Object
43e95429ffa0 (Fget_buffer_create): Copy the name, and clear text props.
Richard M. Stallman <rms@gnu.org>
parents: 10146
diff changeset
194 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
195 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
196 Lisp_Object list;
43e95429ffa0 (Fget_buffer_create): Copy the name, and clear text props.
Richard M. Stallman <rms@gnu.org>
parents: 10146
diff changeset
197 {
43e95429ffa0 (Fget_buffer_create): Copy the name, and clear text props.
Richard M. Stallman <rms@gnu.org>
parents: 10146
diff changeset
198 register Lisp_Object tail;
43e95429ffa0 (Fget_buffer_create): Copy the name, and clear text props.
Richard M. Stallman <rms@gnu.org>
parents: 10146
diff changeset
199 for (tail = list; !NILP (tail); tail = Fcdr (tail))
43e95429ffa0 (Fget_buffer_create): Copy the name, and clear text props.
Richard M. Stallman <rms@gnu.org>
parents: 10146
diff changeset
200 {
43e95429ffa0 (Fget_buffer_create): Copy the name, and clear text props.
Richard M. Stallman <rms@gnu.org>
parents: 10146
diff changeset
201 register Lisp_Object elt, tem;
43e95429ffa0 (Fget_buffer_create): Copy the name, and clear text props.
Richard M. Stallman <rms@gnu.org>
parents: 10146
diff changeset
202 elt = Fcar (tail);
43e95429ffa0 (Fget_buffer_create): Copy the name, and clear text props.
Richard M. Stallman <rms@gnu.org>
parents: 10146
diff changeset
203 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
204 if (!NILP (tem))
43e95429ffa0 (Fget_buffer_create): Copy the name, and clear text props.
Richard M. Stallman <rms@gnu.org>
parents: 10146
diff changeset
205 return elt;
43e95429ffa0 (Fget_buffer_create): Copy the name, and clear text props.
Richard M. Stallman <rms@gnu.org>
parents: 10146
diff changeset
206 }
43e95429ffa0 (Fget_buffer_create): Copy the name, and clear text props.
Richard M. Stallman <rms@gnu.org>
parents: 10146
diff changeset
207 return Qnil;
43e95429ffa0 (Fget_buffer_create): Copy the name, and clear text props.
Richard M. Stallman <rms@gnu.org>
parents: 10146
diff changeset
208 }
43e95429ffa0 (Fget_buffer_create): Copy the name, and clear text props.
Richard M. Stallman <rms@gnu.org>
parents: 10146
diff changeset
209
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
210 DEFUN ("get-buffer", Fget_buffer, Sget_buffer, 1, 1, 0,
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
211 "Return the buffer named NAME (a string).\n\
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
212 If there is no live buffer named NAME, return nil.\n\
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
213 NAME may also be a buffer; if so, the value is that buffer.")
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
214 (name)
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
215 register Lisp_Object name;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
216 {
9146
8f966cc4652b (nsberror, Fget_buffer, Fget_file_buffer, Fbuffer_local_variables,
Karl Heuer <kwzh@gnu.org>
parents: 9047
diff changeset
217 if (BUFFERP (name))
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
218 return name;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
219 CHECK_STRING (name, 0);
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
220
10210
43e95429ffa0 (Fget_buffer_create): Copy the name, and clear text props.
Richard M. Stallman <rms@gnu.org>
parents: 10146
diff changeset
221 return Fcdr (assoc_ignore_text_properties (name, Vbuffer_alist));
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
222 }
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
223
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
224 DEFUN ("get-file-buffer", Fget_file_buffer, Sget_file_buffer, 1, 1, 0,
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
225 "Return the buffer visiting file FILENAME (a string).\n\
6169
16fdee72722b (Fget_file_buffer): Doc fix.
Karl Heuer <kwzh@gnu.org>
parents: 6061
diff changeset
226 The buffer's `buffer-file-name' must match exactly the expansion of FILENAME.\n\
9047
122d7c1a868b (get-file-buffer): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 9006
diff changeset
227 If there is no such live buffer, return nil.\n\
122d7c1a868b (get-file-buffer): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 9006
diff changeset
228 See also `find-buffer-visiting'.")
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
229 (filename)
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
230 register Lisp_Object filename;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
231 {
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
232 register Lisp_Object tail, buf, tem;
5433
7ac1e6f1565f Don't include syntax.h.
Richard M. Stallman <rms@gnu.org>
parents: 5247
diff changeset
233 Lisp_Object handler;
7ac1e6f1565f Don't include syntax.h.
Richard M. Stallman <rms@gnu.org>
parents: 5247
diff changeset
234
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
235 CHECK_STRING (filename, 0);
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
236 filename = Fexpand_file_name (filename, Qnil);
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
237
5433
7ac1e6f1565f Don't include syntax.h.
Richard M. Stallman <rms@gnu.org>
parents: 5247
diff changeset
238 /* If the file name has special constructs in it,
7ac1e6f1565f Don't include syntax.h.
Richard M. Stallman <rms@gnu.org>
parents: 5247
diff changeset
239 call the corresponding file handler. */
7028
6915bf781a38 Pass operation to Ffind_file_name_handler.
Karl Heuer <kwzh@gnu.org>
parents: 6785
diff changeset
240 handler = Ffind_file_name_handler (filename, Qget_file_buffer);
5433
7ac1e6f1565f Don't include syntax.h.
Richard M. Stallman <rms@gnu.org>
parents: 5247
diff changeset
241 if (!NILP (handler))
7ac1e6f1565f Don't include syntax.h.
Richard M. Stallman <rms@gnu.org>
parents: 5247
diff changeset
242 return call2 (handler, Qget_file_buffer, filename);
7ac1e6f1565f Don't include syntax.h.
Richard M. Stallman <rms@gnu.org>
parents: 5247
diff changeset
243
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
244 for (tail = Vbuffer_alist; CONSP (tail); tail = XCONS (tail)->cdr)
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
245 {
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
246 buf = Fcdr (XCONS (tail)->car);
9146
8f966cc4652b (nsberror, Fget_buffer, Fget_file_buffer, Fbuffer_local_variables,
Karl Heuer <kwzh@gnu.org>
parents: 9047
diff changeset
247 if (!BUFFERP (buf)) continue;
8f966cc4652b (nsberror, Fget_buffer, Fget_file_buffer, Fbuffer_local_variables,
Karl Heuer <kwzh@gnu.org>
parents: 9047
diff changeset
248 if (!STRINGP (XBUFFER (buf)->filename)) continue;
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
249 tem = Fstring_equal (XBUFFER (buf)->filename, filename);
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 392
diff changeset
250 if (!NILP (tem))
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
251 return buf;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
252 }
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
253 return Qnil;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
254 }
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
255
12810
bd486675e103 (get_truename_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12785
diff changeset
256 Lisp_Object
bd486675e103 (get_truename_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12785
diff changeset
257 get_truename_buffer (filename)
bd486675e103 (get_truename_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12785
diff changeset
258 register Lisp_Object filename;
bd486675e103 (get_truename_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12785
diff changeset
259 {
bd486675e103 (get_truename_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12785
diff changeset
260 register Lisp_Object tail, buf, tem;
bd486675e103 (get_truename_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12785
diff changeset
261
bd486675e103 (get_truename_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12785
diff changeset
262 for (tail = Vbuffer_alist; CONSP (tail); tail = XCONS (tail)->cdr)
bd486675e103 (get_truename_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12785
diff changeset
263 {
bd486675e103 (get_truename_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12785
diff changeset
264 buf = Fcdr (XCONS (tail)->car);
bd486675e103 (get_truename_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12785
diff changeset
265 if (!BUFFERP (buf)) continue;
bd486675e103 (get_truename_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12785
diff changeset
266 if (!STRINGP (XBUFFER (buf)->file_truename)) continue;
bd486675e103 (get_truename_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12785
diff changeset
267 tem = Fstring_equal (XBUFFER (buf)->file_truename, filename);
bd486675e103 (get_truename_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12785
diff changeset
268 if (!NILP (tem))
bd486675e103 (get_truename_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12785
diff changeset
269 return buf;
bd486675e103 (get_truename_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12785
diff changeset
270 }
bd486675e103 (get_truename_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12785
diff changeset
271 return Qnil;
bd486675e103 (get_truename_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12785
diff changeset
272 }
bd486675e103 (get_truename_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12785
diff changeset
273
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
274 /* Incremented for each buffer created, to assign the buffer number. */
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
275 int buffer_count;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
276
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
277 DEFUN ("get-buffer-create", Fget_buffer_create, Sget_buffer_create, 1, 1, 0,
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
278 "Return the buffer named NAME, or create such a buffer and return it.\n\
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
279 A new buffer is created if there is no live buffer named NAME.\n\
1195
beefc235076e * buffer.c (Fget_buffer_create): Doc fix.
Jim Blandy <jimb@redhat.com>
parents: 1041
diff changeset
280 If NAME starts with a space, the new buffer does not keep undo information.\n\
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
281 If NAME is a buffer instead of a string, then it is the value returned.\n\
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
282 The value is never nil.")
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
283 (name)
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
284 register Lisp_Object name;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
285 {
9732
577db538b0b6 (Fset_buffer_major_mode): New function. Set the default major mode here.
Karl Heuer <kwzh@gnu.org>
parents: 9632
diff changeset
286 register Lisp_Object buf;
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
287 register struct buffer *b;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
288
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
289 buf = Fget_buffer (name);
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 392
diff changeset
290 if (!NILP (buf))
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
291 return buf;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
292
6697
28e36f59e856 (Fget_buffer_create): Disallow empty string.
Karl Heuer <kwzh@gnu.org>
parents: 6675
diff changeset
293 if (XSTRING (name)->size == 0)
28e36f59e856 (Fget_buffer_create): Disallow empty string.
Karl Heuer <kwzh@gnu.org>
parents: 6675
diff changeset
294 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
295
2439
b6c62e4abf59 Put interrupt input blocking in a separate file from xterm.h.
Jim Blandy <jimb@redhat.com>
parents: 2389
diff changeset
296 b = (struct buffer *) xmalloc (sizeof (struct buffer));
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
297
10314
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
298 b->size = sizeof (struct buffer) / sizeof (EMACS_INT);
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
299
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
300 /* 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
301 b->text = &b->own_text;
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
302 b->base_buffer = 0;
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
303
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
304 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
305 BLOCK_INPUT;
17022
907fb167f7de Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16840
diff changeset
306 /* We allocate extra 1-byte at the tail and keep it always '\0' for
907fb167f7de Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16840
diff changeset
307 anchoring a search. */
907fb167f7de Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16840
diff changeset
308 BUFFER_ALLOC (BUF_BEG_ADDR (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
309 UNBLOCK_INPUT;
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
310 if (! BUF_BEG_ADDR (b))
10668
acbd9fab366a (Fget_buffer_create): Call buffer_memory_full.
Richard M. Stallman <rms@gnu.org>
parents: 10611
diff changeset
311 buffer_memory_full ();
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
312
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
313 BUF_PT (b) = 1;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
314 BUF_GPT (b) = 1;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
315 BUF_BEGV (b) = 1;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
316 BUF_ZV (b) = 1;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
317 BUF_Z (b) = 1;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
318 BUF_MODIFF (b) = 1;
16213
3b8851bebc76 (Fget_buffer_create): Initialize BUF_OVERLAY_MODIFF.
Richard M. Stallman <rms@gnu.org>
parents: 16193
diff changeset
319 BUF_OVERLAY_MODIFF (b) = 1;
10314
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
320 BUF_SAVE_MODIFF (b) = 1;
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
321 BUF_INTERVALS (b) = 0;
17022
907fb167f7de Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16840
diff changeset
322 *(BUF_GPT_ADDR (b)) = *(BUF_Z_ADDR (b)) = 0; /* Put an anchor '\0'. */
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
323
9403
9f797989b817 * buffer.c: #include region-cache.h.
Jim Blandy <jimb@redhat.com>
parents: 9362
diff changeset
324 b->newline_cache = 0;
9f797989b817 * buffer.c: #include region-cache.h.
Jim Blandy <jimb@redhat.com>
parents: 9362
diff changeset
325 b->width_run_cache = 0;
9f797989b817 * buffer.c: #include region-cache.h.
Jim Blandy <jimb@redhat.com>
parents: 9362
diff changeset
326 b->width_table = Qnil;
9f797989b817 * buffer.c: #include region-cache.h.
Jim Blandy <jimb@redhat.com>
parents: 9362
diff changeset
327
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
328 /* Put this on the chain of all buffers including killed ones. */
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
329 b->next = all_buffers;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
330 all_buffers = b;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
331
10314
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
332 /* An ordinary buffer normally doesn't need markers
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
333 to handle BEGV and ZV. */
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
334 b->pt_marker = Qnil;
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
335 b->begv_marker = Qnil;
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
336 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
337
43e95429ffa0 (Fget_buffer_create): Copy the name, and clear text props.
Richard M. Stallman <rms@gnu.org>
parents: 10146
diff changeset
338 name = Fcopy_sequence (name);
43e95429ffa0 (Fget_buffer_create): Copy the name, and clear text props.
Richard M. Stallman <rms@gnu.org>
parents: 10146
diff changeset
339 INITIALIZE_INTERVAL (XSTRING (name), NULL_INTERVAL);
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
340 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
341
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
342 if (XSTRING (name)->data[0] != ' ')
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
343 b->undo_list = Qnil;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
344 else
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
345 b->undo_list = Qt;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
346
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
347 reset_buffer (b);
15776
6018e01d4466 (buffer_permanent_local_flags): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 15638
diff changeset
348 reset_buffer_local_variables (b, 1);
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
349
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
350 /* 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
351 XSETBUFFER (buf, b);
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
352 Vbuffer_alist = nconc2 (Vbuffer_alist, Fcons (Fcons (name, buf), Qnil));
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
353
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
354 b->mark = Fmake_marker ();
10314
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
355 BUF_MARKERS (b) = Qnil;
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
356 b->name = name;
9732
577db538b0b6 (Fset_buffer_major_mode): New function. Set the default major mode here.
Karl Heuer <kwzh@gnu.org>
parents: 9632
diff changeset
357 return buf;
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
358 }
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
359
14060
b62397f49a24 (Fmake_indirect_buffer, Fset_buffer_major_mode, Fpop_to_buffer,
Erik Naggum <erik@naggum.no>
parents: 13922
diff changeset
360 DEFUN ("make-indirect-buffer", Fmake_indirect_buffer, Smake_indirect_buffer, 2, 2,
11838
92a61e91ec05 (Fmake_indirect_buffer): Fix interactive spec.
Karl Heuer <kwzh@gnu.org>
parents: 11823
diff changeset
361 "bMake indirect buffer (to buffer): \nBName of indirect buffer: ",
14060
b62397f49a24 (Fmake_indirect_buffer, Fset_buffer_major_mode, Fpop_to_buffer,
Erik Naggum <erik@naggum.no>
parents: 13922
diff changeset
362 "Create and return an indirect buffer for buffer BASE-BUFFER, named NAME.\n\
b62397f49a24 (Fmake_indirect_buffer, Fset_buffer_major_mode, Fpop_to_buffer,
Erik Naggum <erik@naggum.no>
parents: 13922
diff changeset
363 BASE-BUFFER should be an existing buffer (or buffer name).\n\
11000
8482ccc01ec7 (Fmake_indirect_buffer): Invert the arguments.
Richard M. Stallman <rms@gnu.org>
parents: 10967
diff changeset
364 NAME should be a string which is not the name of an existing buffer.")
8482ccc01ec7 (Fmake_indirect_buffer): Invert the arguments.
Richard M. Stallman <rms@gnu.org>
parents: 10967
diff changeset
365 (base_buffer, name)
8482ccc01ec7 (Fmake_indirect_buffer): Invert the arguments.
Richard M. Stallman <rms@gnu.org>
parents: 10967
diff changeset
366 register Lisp_Object base_buffer, name;
10314
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
367 {
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
368 register Lisp_Object buf;
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
369 register struct buffer *b;
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
370
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
371 buf = Fget_buffer (name);
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
372 if (!NILP (buf))
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
373 error ("Buffer name `%s' is in use", XSTRING (name)->data);
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
374
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
375 base_buffer = Fget_buffer (base_buffer);
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
376 if (NILP (base_buffer))
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
377 error ("No such buffer: `%s'",
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
378 XSTRING (XBUFFER (base_buffer)->name)->data);
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
379
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
380 if (XSTRING (name)->size == 0)
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
381 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
382
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
383 b = (struct buffer *) xmalloc (sizeof (struct buffer));
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
384
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
385 b->size = sizeof (struct buffer) / sizeof (EMACS_INT);
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
386
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
387 if (XBUFFER (base_buffer)->base_buffer)
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
388 b->base_buffer = XBUFFER (base_buffer)->base_buffer;
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
389 else
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
390 b->base_buffer = XBUFFER (base_buffer);
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
391
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
392 /* Use the base buffer's text object. */
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
393 b->text = b->base_buffer->text;
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
394
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
395 BUF_BEGV (b) = BUF_BEGV (b->base_buffer);
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
396 BUF_ZV (b) = BUF_ZV (b->base_buffer);
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
397 BUF_PT (b) = BUF_PT (b->base_buffer);
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
398
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
399 b->newline_cache = 0;
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
400 b->width_run_cache = 0;
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
401 b->width_table = Qnil;
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
402
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
403 /* 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
404 b->next = all_buffers;
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
405 all_buffers = b;
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
406
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
407 name = Fcopy_sequence (name);
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
408 INITIALIZE_INTERVAL (XSTRING (name), NULL_INTERVAL);
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
409 b->name = name;
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
410
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
411 reset_buffer (b);
15776
6018e01d4466 (buffer_permanent_local_flags): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 15638
diff changeset
412 reset_buffer_local_variables (b, 1);
10314
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
413
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
414 /* 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
415 XSETBUFFER (buf, b);
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
416 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
417
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
418 b->mark = Fmake_marker ();
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
419 b->name = name;
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
420
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
421 /* 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
422 if (NILP (b->base_buffer->pt_marker))
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
423 {
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
424 b->base_buffer->pt_marker = Fmake_marker ();
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
425 Fset_marker (b->base_buffer->pt_marker,
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
426 make_number (BUF_PT (b->base_buffer)), base_buffer);
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
427 }
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
428 if (NILP (b->base_buffer->begv_marker))
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
429 {
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
430 b->base_buffer->begv_marker = Fmake_marker ();
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
431 Fset_marker (b->base_buffer->begv_marker,
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
432 make_number (BUF_BEGV (b->base_buffer)), base_buffer);
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
433 }
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
434 if (NILP (b->base_buffer->zv_marker))
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
435 {
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
436 b->base_buffer->zv_marker = Fmake_marker ();
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
437 Fset_marker (b->base_buffer->zv_marker,
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
438 make_number (BUF_ZV (b->base_buffer)), base_buffer);
12998
404ae27d5148 (Fmake_indirect_buffer): Set the insertion_type of the zv_marker markers to 1.
Richard M. Stallman <rms@gnu.org>
parents: 12810
diff changeset
439 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
440 }
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
441
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
442 /* Give the indirect buffer markers for its narrowing. */
13114
c521a85eaafd (Fmake_indirect_buffer): Was taking marker positions
Richard M. Stallman <rms@gnu.org>
parents: 13110
diff changeset
443 b->pt_marker = Fmake_marker ();
c521a85eaafd (Fmake_indirect_buffer): Was taking marker positions
Richard M. Stallman <rms@gnu.org>
parents: 13110
diff changeset
444 Fset_marker (b->pt_marker, make_number (BUF_PT (b)), buf);
c521a85eaafd (Fmake_indirect_buffer): Was taking marker positions
Richard M. Stallman <rms@gnu.org>
parents: 13110
diff changeset
445 b->begv_marker = Fmake_marker ();
c521a85eaafd (Fmake_indirect_buffer): Was taking marker positions
Richard M. Stallman <rms@gnu.org>
parents: 13110
diff changeset
446 Fset_marker (b->begv_marker, make_number (BUF_BEGV (b)), buf);
c521a85eaafd (Fmake_indirect_buffer): Was taking marker positions
Richard M. Stallman <rms@gnu.org>
parents: 13110
diff changeset
447 b->zv_marker = Fmake_marker ();
c521a85eaafd (Fmake_indirect_buffer): Was taking marker positions
Richard M. Stallman <rms@gnu.org>
parents: 13110
diff changeset
448 Fset_marker (b->zv_marker, make_number (BUF_ZV (b)), buf);
c521a85eaafd (Fmake_indirect_buffer): Was taking marker positions
Richard M. Stallman <rms@gnu.org>
parents: 13110
diff changeset
449
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
450 XMARKER (b->zv_marker)->insertion_type = 1;
10314
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
451
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
452 return buf;
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
453 }
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
454
8873
b58ea8cae183 (reset_buffer): Don't call reset_buffer_local_variables.
Richard M. Stallman <rms@gnu.org>
parents: 8839
diff changeset
455 /* Reinitialize everything about a buffer except its name and contents
b58ea8cae183 (reset_buffer): Don't call reset_buffer_local_variables.
Richard M. Stallman <rms@gnu.org>
parents: 8839
diff changeset
456 and local variables. */
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
457
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
458 void
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
459 reset_buffer (b)
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
460 register struct buffer *b;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
461 {
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
462 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
463 b->file_truename = Qnil;
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
464 b->directory = (current_buffer) ? current_buffer->directory : Qnil;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
465 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
466 XSETFASTINT (b->save_length, 0);
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
467 b->last_window_start = 1;
17566
7ed40081342f (reset_buffer): Initialize clip_changed field.
Richard M. Stallman <rms@gnu.org>
parents: 17238
diff changeset
468 /* It is more conservative to start out "changed" than "unchanged". */
7ed40081342f (reset_buffer): Initialize clip_changed field.
Richard M. Stallman <rms@gnu.org>
parents: 17238
diff changeset
469 b->clip_changed = 1;
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
470 b->backed_up = Qnil;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
471 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
472 b->auto_save_failure_time = -1;
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
473 b->auto_save_file_name = Qnil;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
474 b->read_only = Qnil;
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
475 b->overlays_before = Qnil;
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
476 b->overlays_after = Qnil;
9296
a1a7fc21ded9 (reset_buffer, Ferase_buffer, validate_region, list_buffers_1, recenter_overlay_lists, init_buffer_once): Don't use XFASTINT as an lvalue.
Karl Heuer <kwzh@gnu.org>
parents: 9262
diff changeset
477 XSETFASTINT (b->overlay_center, 1);
3242
f873e6b9af52 (reset_buffer): Clear mark_active field here.
Richard M. Stallman <rms@gnu.org>
parents: 3226
diff changeset
478 b->mark_active = Qnil;
10561
53f34c870201 (init_buffer_once, syms_of_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 10505
diff changeset
479 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
480 b->file_format = Qnil;
16067
5c9f298c9875 (reset_buffer): Initialize last_selected_window slot.
Richard M. Stallman <rms@gnu.org>
parents: 16051
diff changeset
481 b->last_selected_window = Qnil;
17218
a57ca25e9c62 (reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents: 17124
diff changeset
482 XSETINT (b->display_count, 0);
13263
b135b01ba0e2 (reset_buffer): Initialize extra1, extra2 and extra3 slots.
Richard M. Stallman <rms@gnu.org>
parents: 13262
diff changeset
483 b->extra2 = Qnil;
b135b01ba0e2 (reset_buffer): Initialize extra1, extra2 and extra3 slots.
Richard M. Stallman <rms@gnu.org>
parents: 13262
diff changeset
484 b->extra3 = Qnil;
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
485 }
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
486
8873
b58ea8cae183 (reset_buffer): Don't call reset_buffer_local_variables.
Richard M. Stallman <rms@gnu.org>
parents: 8839
diff changeset
487 /* 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
488 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
489 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
490 Instead, use Fkill_all_local_variables.
6018e01d4466 (buffer_permanent_local_flags): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 15638
diff changeset
491
6018e01d4466 (buffer_permanent_local_flags): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 15638
diff changeset
492 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
493 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
494 we preserve those. */
6018e01d4466 (buffer_permanent_local_flags): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 15638
diff changeset
495
6018e01d4466 (buffer_permanent_local_flags): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 15638
diff changeset
496 static void
6018e01d4466 (buffer_permanent_local_flags): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 15638
diff changeset
497 reset_buffer_local_variables (b, permanent_too)
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
498 register struct buffer *b;
15776
6018e01d4466 (buffer_permanent_local_flags): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 15638
diff changeset
499 int permanent_too;
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
500 {
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
501 register int offset;
15776
6018e01d4466 (buffer_permanent_local_flags): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 15638
diff changeset
502 int dont_reset;
6018e01d4466 (buffer_permanent_local_flags): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 15638
diff changeset
503
6018e01d4466 (buffer_permanent_local_flags): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 15638
diff changeset
504 /* Decide which built-in local variables to reset. */
6018e01d4466 (buffer_permanent_local_flags): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 15638
diff changeset
505 if (permanent_too)
6018e01d4466 (buffer_permanent_local_flags): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 15638
diff changeset
506 dont_reset = 0;
6018e01d4466 (buffer_permanent_local_flags): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 15638
diff changeset
507 else
6018e01d4466 (buffer_permanent_local_flags): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 15638
diff changeset
508 dont_reset = buffer_permanent_local_flags;
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
509
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
510 /* Reset the major mode to Fundamental, together with all the
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
511 things that depend on the major mode.
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
512 default-major-mode is handled at a higher level.
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
513 We ignore it here. */
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
514 b->major_mode = Qfundamental_mode;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
515 b->keymap = Qnil;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
516 b->abbrev_table = Vfundamental_mode_abbrev_table;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
517 b->mode_name = QSFundamental;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
518 b->minor_modes = Qnil;
13270
76e69b0af94d (reset_buffer_local_variables): Call
Richard M. Stallman <rms@gnu.org>
parents: 13263
diff changeset
519
76e69b0af94d (reset_buffer_local_variables): Call
Richard M. Stallman <rms@gnu.org>
parents: 13263
diff changeset
520 /* 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
521 fix up its insides first. */
76e69b0af94d (reset_buffer_local_variables): Call
Richard M. Stallman <rms@gnu.org>
parents: 13263
diff changeset
522 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
523 && 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
524 && 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
525 Fset_standard_case_table (Vascii_downcase_table);
76e69b0af94d (reset_buffer_local_variables): Call
Richard M. Stallman <rms@gnu.org>
parents: 13263
diff changeset
526
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
527 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
528 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
529 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
530 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
531 b->invisibility_spec = Qt;
15786
f2d0e8928d57 (buffer_permanent_local_flags): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 15776
diff changeset
532 #ifndef DOS_NT
f2d0e8928d57 (buffer_permanent_local_flags): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 15776
diff changeset
533 b->buffer_file_type = Qnil;
f2d0e8928d57 (buffer_permanent_local_flags): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 15776
diff changeset
534 #endif
10967
b53b84b6f46d (reset_buffer_local_variables): Init invisibility.
Richard M. Stallman <rms@gnu.org>
parents: 10916
diff changeset
535
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
536 #if 0
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
537 b->sort_table = XSTRING (Vascii_sort_table);
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
538 b->folding_sort_table = XSTRING (Vascii_folding_sort_table);
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
539 #endif /* 0 */
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
540
15776
6018e01d4466 (buffer_permanent_local_flags): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 15638
diff changeset
541 /* Reset all (or most) per-buffer variables to their defaults. */
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
542 b->local_var_alist = Qnil;
15776
6018e01d4466 (buffer_permanent_local_flags): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 15638
diff changeset
543 b->local_var_flags &= dont_reset;
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
544
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
545 /* For each slot that has a default value,
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
546 copy that into the slot. */
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
547
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
548 for (offset = (char *)&buffer_local_flags.name - (char *)&buffer_local_flags;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
549 offset < sizeof (struct buffer);
8818
0996472bb39d (reset_buffer_local_variables, Fbuffer_local_variables)
Richard M. Stallman <rms@gnu.org>
parents: 8599
diff changeset
550 offset += sizeof (Lisp_Object)) /* sizeof EMACS_INT == sizeof Lisp_Object */
9362
f6dc29e7e986 (init_buffer_once): Don't use XSETFASTINT when negative.
Karl Heuer <kwzh@gnu.org>
parents: 9335
diff changeset
551 {
f6dc29e7e986 (init_buffer_once): Don't use XSETFASTINT when negative.
Karl Heuer <kwzh@gnu.org>
parents: 9335
diff changeset
552 int flag = XINT (*(Lisp_Object *)(offset + (char *)&buffer_local_flags));
15776
6018e01d4466 (buffer_permanent_local_flags): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 15638
diff changeset
553 if ((flag > 0
6018e01d4466 (buffer_permanent_local_flags): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 15638
diff changeset
554 /* Don't reset a permanent local. */
6018e01d4466 (buffer_permanent_local_flags): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 15638
diff changeset
555 && ! (dont_reset & flag))
6018e01d4466 (buffer_permanent_local_flags): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 15638
diff changeset
556 || flag == -2)
6018e01d4466 (buffer_permanent_local_flags): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 15638
diff changeset
557 *(Lisp_Object *)(offset + (char *)b)
6018e01d4466 (buffer_permanent_local_flags): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 15638
diff changeset
558 = *(Lisp_Object *)(offset + (char *)&buffer_defaults);
9362
f6dc29e7e986 (init_buffer_once): Don't use XSETFASTINT when negative.
Karl Heuer <kwzh@gnu.org>
parents: 9335
diff changeset
559 }
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
560 }
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
561
392
dce611246f59 *** empty log message ***
Roland McGrath <roland@gnu.org>
parents: 333
diff changeset
562 /* We split this away from generate-new-buffer, because rename-buffer
dce611246f59 *** empty log message ***
Roland McGrath <roland@gnu.org>
parents: 333
diff changeset
563 and set-visited-file-name ought to be able to use this to really
dce611246f59 *** empty log message ***
Roland McGrath <roland@gnu.org>
parents: 333
diff changeset
564 rename the buffer properly. */
dce611246f59 *** empty log message ***
Roland McGrath <roland@gnu.org>
parents: 333
diff changeset
565
dce611246f59 *** empty log message ***
Roland McGrath <roland@gnu.org>
parents: 333
diff changeset
566 DEFUN ("generate-new-buffer-name", Fgenerate_new_buffer_name, Sgenerate_new_buffer_name,
3226
bc4beddaf2c7 (Fgenerate_new_buffer_name): New arg IGNORE.
Richard M. Stallman <rms@gnu.org>
parents: 3204
diff changeset
567 1, 2, 0,
392
dce611246f59 *** empty log message ***
Roland McGrath <roland@gnu.org>
parents: 333
diff changeset
568 "Return a string that is the name of no existing buffer based on NAME.\n\
dce611246f59 *** empty log message ***
Roland McGrath <roland@gnu.org>
parents: 333
diff changeset
569 If there is no live buffer named NAME, then return NAME.\n\
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
570 Otherwise modify name by appending `<NUMBER>', incrementing NUMBER\n\
3226
bc4beddaf2c7 (Fgenerate_new_buffer_name): New arg IGNORE.
Richard M. Stallman <rms@gnu.org>
parents: 3204
diff changeset
571 until an unused name is found, and then return that name.\n\
3329
c9443f73d329 (Fgenerate_new_buffer_name): Doc fix.
Roland McGrath <roland@gnu.org>
parents: 3295
diff changeset
572 Optional second argument IGNORE specifies a name that is okay to use\n\
3226
bc4beddaf2c7 (Fgenerate_new_buffer_name): New arg IGNORE.
Richard M. Stallman <rms@gnu.org>
parents: 3204
diff changeset
573 \(if it is in the sequence to be tried)\n\
3295
4d405f172c79 (reset_buffer): Clear mark_active field here.
Richard M. Stallman <rms@gnu.org>
parents: 3242
diff changeset
574 even if a buffer with that name exists.")
3226
bc4beddaf2c7 (Fgenerate_new_buffer_name): New arg IGNORE.
Richard M. Stallman <rms@gnu.org>
parents: 3204
diff changeset
575 (name, ignore)
bc4beddaf2c7 (Fgenerate_new_buffer_name): New arg IGNORE.
Richard M. Stallman <rms@gnu.org>
parents: 3204
diff changeset
576 register Lisp_Object name, ignore;
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
577 {
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
578 register Lisp_Object gentemp, tem;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
579 int count;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
580 char number[10];
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
581
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
582 CHECK_STRING (name, 0);
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
583
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
584 tem = Fget_buffer (name);
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 392
diff changeset
585 if (NILP (tem))
392
dce611246f59 *** empty log message ***
Roland McGrath <roland@gnu.org>
parents: 333
diff changeset
586 return name;
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
587
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
588 count = 1;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
589 while (1)
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
590 {
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
591 sprintf (number, "<%d>", ++count);
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
592 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
593 tem = Fstring_equal (gentemp, ignore);
3226
bc4beddaf2c7 (Fgenerate_new_buffer_name): New arg IGNORE.
Richard M. Stallman <rms@gnu.org>
parents: 3204
diff changeset
594 if (!NILP (tem))
bc4beddaf2c7 (Fgenerate_new_buffer_name): New arg IGNORE.
Richard M. Stallman <rms@gnu.org>
parents: 3204
diff changeset
595 return gentemp;
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
596 tem = Fget_buffer (gentemp);
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 392
diff changeset
597 if (NILP (tem))
392
dce611246f59 *** empty log message ***
Roland McGrath <roland@gnu.org>
parents: 333
diff changeset
598 return gentemp;
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
599 }
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
600 }
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
601
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
602
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
603 DEFUN ("buffer-name", Fbuffer_name, Sbuffer_name, 0, 1, 0,
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
604 "Return the name of BUFFER, as a string.\n\
392
dce611246f59 *** empty log message ***
Roland McGrath <roland@gnu.org>
parents: 333
diff changeset
605 With no argument or nil as argument, return the name of the current buffer.")
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
606 (buffer)
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
607 register Lisp_Object buffer;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
608 {
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 392
diff changeset
609 if (NILP (buffer))
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
610 return current_buffer->name;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
611 CHECK_BUFFER (buffer, 0);
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
612 return XBUFFER (buffer)->name;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
613 }
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
614
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
615 DEFUN ("buffer-file-name", Fbuffer_file_name, Sbuffer_file_name, 0, 1, 0,
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
616 "Return name of file BUFFER is visiting, or nil if none.\n\
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
617 No argument or nil as argument means use the current buffer.")
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
618 (buffer)
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
619 register Lisp_Object buffer;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
620 {
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 392
diff changeset
621 if (NILP (buffer))
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
622 return current_buffer->filename;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
623 CHECK_BUFFER (buffer, 0);
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
624 return XBUFFER (buffer)->filename;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
625 }
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
626
10314
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
627 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
628 0, 1, 0,
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
629 "Return the base buffer of indirect buffer BUFFER.\n\
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
630 If BUFFER is not indirect, return nil.")
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
631 (buffer)
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
632 register Lisp_Object buffer;
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
633 {
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
634 struct buffer *base;
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
635 Lisp_Object base_buffer;
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
636
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
637 if (NILP (buffer))
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
638 base = current_buffer->base_buffer;
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
639 else
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
640 {
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
641 CHECK_BUFFER (buffer, 0);
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
642 base = XBUFFER (buffer)->base_buffer;
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
643 }
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
644
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
645 if (! base)
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
646 return Qnil;
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
647 XSETBUFFER (base_buffer, base);
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
648 return base_buffer;
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
649 }
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
650
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
651 DEFUN ("buffer-local-variables", Fbuffer_local_variables,
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
652 Sbuffer_local_variables, 0, 1, 0,
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
653 "Return an alist of variables that are buffer-local in BUFFER.\n\
4100
f8c6e5e9603f (Fbuffer_local_variables): For local var that is unbound,
Richard M. Stallman <rms@gnu.org>
parents: 4077
diff changeset
654 Most elements look like (SYMBOL . VALUE), describing one variable.\n\
f8c6e5e9603f (Fbuffer_local_variables): For local var that is unbound,
Richard M. Stallman <rms@gnu.org>
parents: 4077
diff changeset
655 For a symbol that is locally unbound, just the symbol appears in the value.\n\
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
656 Note that storing new VALUEs in these elements doesn't change the variables.\n\
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
657 No argument or nil as argument means use current buffer as BUFFER.")
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
658 (buffer)
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
659 register Lisp_Object buffer;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
660 {
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
661 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
662 register Lisp_Object result;
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
663
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 392
diff changeset
664 if (NILP (buffer))
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
665 buf = current_buffer;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
666 else
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
667 {
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
668 CHECK_BUFFER (buffer, 0);
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
669 buf = XBUFFER (buffer);
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
670 }
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
671
4100
f8c6e5e9603f (Fbuffer_local_variables): For local var that is unbound,
Richard M. Stallman <rms@gnu.org>
parents: 4077
diff changeset
672 result = Qnil;
f8c6e5e9603f (Fbuffer_local_variables): For local var that is unbound,
Richard M. Stallman <rms@gnu.org>
parents: 4077
diff changeset
673
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
674 {
4100
f8c6e5e9603f (Fbuffer_local_variables): For local var that is unbound,
Richard M. Stallman <rms@gnu.org>
parents: 4077
diff changeset
675 register Lisp_Object tail;
f8c6e5e9603f (Fbuffer_local_variables): For local var that is unbound,
Richard M. Stallman <rms@gnu.org>
parents: 4077
diff changeset
676 for (tail = buf->local_var_alist; CONSP (tail); tail = XCONS (tail)->cdr)
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
677 {
4100
f8c6e5e9603f (Fbuffer_local_variables): For local var that is unbound,
Richard M. Stallman <rms@gnu.org>
parents: 4077
diff changeset
678 Lisp_Object val, elt;
f8c6e5e9603f (Fbuffer_local_variables): For local var that is unbound,
Richard M. Stallman <rms@gnu.org>
parents: 4077
diff changeset
679
f8c6e5e9603f (Fbuffer_local_variables): For local var that is unbound,
Richard M. Stallman <rms@gnu.org>
parents: 4077
diff changeset
680 elt = XCONS (tail)->car;
f8c6e5e9603f (Fbuffer_local_variables): For local var that is unbound,
Richard M. Stallman <rms@gnu.org>
parents: 4077
diff changeset
681
10505
4f7f9b9ff513 (syms_of_buffer) [DOS_NT]: Add missing ';'.
Richard M. Stallman <rms@gnu.org>
parents: 10443
diff changeset
682 /* Reference each variable in the alist in buf.
4f7f9b9ff513 (syms_of_buffer) [DOS_NT]: Add missing ';'.
Richard M. Stallman <rms@gnu.org>
parents: 10443
diff changeset
683 If inquiring about the current buffer, this gets the current values,
4f7f9b9ff513 (syms_of_buffer) [DOS_NT]: Add missing ';'.
Richard M. Stallman <rms@gnu.org>
parents: 10443
diff changeset
684 so store them into the alist so the alist is up to date.
4f7f9b9ff513 (syms_of_buffer) [DOS_NT]: Add missing ';'.
Richard M. Stallman <rms@gnu.org>
parents: 10443
diff changeset
685 If inquiring about some other buffer, this swaps out any values
4f7f9b9ff513 (syms_of_buffer) [DOS_NT]: Add missing ';'.
Richard M. Stallman <rms@gnu.org>
parents: 10443
diff changeset
686 for that buffer, making the alist up to date automatically. */
4f7f9b9ff513 (syms_of_buffer) [DOS_NT]: Add missing ';'.
Richard M. Stallman <rms@gnu.org>
parents: 10443
diff changeset
687 val = find_symbol_value (XCONS (elt)->car);
4f7f9b9ff513 (syms_of_buffer) [DOS_NT]: Add missing ';'.
Richard M. Stallman <rms@gnu.org>
parents: 10443
diff changeset
688 /* Use the current buffer value only if buf is the current buffer. */
4f7f9b9ff513 (syms_of_buffer) [DOS_NT]: Add missing ';'.
Richard M. Stallman <rms@gnu.org>
parents: 10443
diff changeset
689 if (buf != current_buffer)
4100
f8c6e5e9603f (Fbuffer_local_variables): For local var that is unbound,
Richard M. Stallman <rms@gnu.org>
parents: 4077
diff changeset
690 val = XCONS (elt)->cdr;
f8c6e5e9603f (Fbuffer_local_variables): For local var that is unbound,
Richard M. Stallman <rms@gnu.org>
parents: 4077
diff changeset
691
f8c6e5e9603f (Fbuffer_local_variables): For local var that is unbound,
Richard M. Stallman <rms@gnu.org>
parents: 4077
diff changeset
692 /* If symbol is unbound, put just the symbol in the list. */
f8c6e5e9603f (Fbuffer_local_variables): For local var that is unbound,
Richard M. Stallman <rms@gnu.org>
parents: 4077
diff changeset
693 if (EQ (val, Qunbound))
f8c6e5e9603f (Fbuffer_local_variables): For local var that is unbound,
Richard M. Stallman <rms@gnu.org>
parents: 4077
diff changeset
694 result = Fcons (XCONS (elt)->car, result);
f8c6e5e9603f (Fbuffer_local_variables): For local var that is unbound,
Richard M. Stallman <rms@gnu.org>
parents: 4077
diff changeset
695 /* Otherwise, put (symbol . value) in the list. */
f8c6e5e9603f (Fbuffer_local_variables): For local var that is unbound,
Richard M. Stallman <rms@gnu.org>
parents: 4077
diff changeset
696 else
f8c6e5e9603f (Fbuffer_local_variables): For local var that is unbound,
Richard M. Stallman <rms@gnu.org>
parents: 4077
diff changeset
697 result = Fcons (Fcons (XCONS (elt)->car, val), result);
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
698 }
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
699 }
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
700
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
701 /* Add on all the variables stored in special slots. */
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
702 {
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
703 register int offset, mask;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
704
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
705 for (offset = (char *)&buffer_local_symbols.name - (char *)&buffer_local_symbols;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
706 offset < sizeof (struct buffer);
8818
0996472bb39d (reset_buffer_local_variables, Fbuffer_local_variables)
Richard M. Stallman <rms@gnu.org>
parents: 8599
diff changeset
707 offset += (sizeof (EMACS_INT))) /* sizeof EMACS_INT == sizeof Lisp_Object */
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
708 {
9362
f6dc29e7e986 (init_buffer_once): Don't use XSETFASTINT when negative.
Karl Heuer <kwzh@gnu.org>
parents: 9335
diff changeset
709 mask = XINT (*(Lisp_Object *)(offset + (char *)&buffer_local_flags));
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
710 if (mask == -1 || (buf->local_var_flags & mask))
9362
f6dc29e7e986 (init_buffer_once): Don't use XSETFASTINT when negative.
Karl Heuer <kwzh@gnu.org>
parents: 9335
diff changeset
711 if (SYMBOLP (*(Lisp_Object *)(offset
f6dc29e7e986 (init_buffer_once): Don't use XSETFASTINT when negative.
Karl Heuer <kwzh@gnu.org>
parents: 9335
diff changeset
712 + (char *)&buffer_local_symbols)))
f6dc29e7e986 (init_buffer_once): Don't use XSETFASTINT when negative.
Karl Heuer <kwzh@gnu.org>
parents: 9335
diff changeset
713 result = Fcons (Fcons (*((Lisp_Object *)
f6dc29e7e986 (init_buffer_once): Don't use XSETFASTINT when negative.
Karl Heuer <kwzh@gnu.org>
parents: 9335
diff changeset
714 (offset + (char *)&buffer_local_symbols)),
4100
f8c6e5e9603f (Fbuffer_local_variables): For local var that is unbound,
Richard M. Stallman <rms@gnu.org>
parents: 4077
diff changeset
715 *(Lisp_Object *)(offset + (char *)buf)),
f8c6e5e9603f (Fbuffer_local_variables): For local var that is unbound,
Richard M. Stallman <rms@gnu.org>
parents: 4077
diff changeset
716 result);
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
717 }
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
718 }
4100
f8c6e5e9603f (Fbuffer_local_variables): For local var that is unbound,
Richard M. Stallman <rms@gnu.org>
parents: 4077
diff changeset
719
f8c6e5e9603f (Fbuffer_local_variables): For local var that is unbound,
Richard M. Stallman <rms@gnu.org>
parents: 4077
diff changeset
720 return result;
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
721 }
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
722
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
723
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
724 DEFUN ("buffer-modified-p", Fbuffer_modified_p, Sbuffer_modified_p,
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
725 0, 1, 0,
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
726 "Return t if BUFFER was modified since its file was last read or saved.\n\
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
727 No argument or nil as argument means use current buffer as BUFFER.")
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
728 (buffer)
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
729 register Lisp_Object buffer;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
730 {
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
731 register struct buffer *buf;
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 392
diff changeset
732 if (NILP (buffer))
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
733 buf = current_buffer;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
734 else
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
735 {
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
736 CHECK_BUFFER (buffer, 0);
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
737 buf = XBUFFER (buffer);
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
738 }
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
739
10314
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
740 return BUF_SAVE_MODIFF (buf) < BUF_MODIFF (buf) ? Qt : Qnil;
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
741 }
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
742
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
743 DEFUN ("set-buffer-modified-p", Fset_buffer_modified_p, Sset_buffer_modified_p,
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
744 1, 1, 0,
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
745 "Mark current buffer as modified or unmodified according to FLAG.\n\
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
746 A non-nil FLAG means mark the buffer modified.")
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
747 (flag)
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
748 register Lisp_Object flag;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
749 {
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
750 register int already;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
751 register Lisp_Object fn;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
752
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
753 #ifdef CLASH_DETECTION
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
754 /* If buffer becoming modified, lock the file.
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
755 If buffer becoming unmodified, unlock the file. */
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
756
11659
f9b6e65774e7 (Fset_buffer_modified_p): Use the truename for locking.
Richard M. Stallman <rms@gnu.org>
parents: 11473
diff changeset
757 fn = current_buffer->file_truename;
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 392
diff changeset
758 if (!NILP (fn))
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
759 {
10314
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
760 already = SAVE_MODIFF < MODIFF;
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 392
diff changeset
761 if (!already && !NILP (flag))
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
762 lock_file (fn);
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 392
diff changeset
763 else if (already && NILP (flag))
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
764 unlock_file (fn);
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
765 }
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
766 #endif /* CLASH_DETECTION */
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
767
10314
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
768 SAVE_MODIFF = NILP (flag) ? MODIFF : 0;
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
769 update_mode_lines++;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
770 return flag;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
771 }
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
772
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
773 DEFUN ("buffer-modified-tick", Fbuffer_modified_tick, Sbuffer_modified_tick,
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
774 0, 1, 0,
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
775 "Return BUFFER's tick counter, incremented for each change in text.\n\
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
776 Each buffer has a tick counter which is incremented each time the text in\n\
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
777 that buffer is changed. It wraps around occasionally.\n\
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
778 No argument or nil as argument means use current buffer as BUFFER.")
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
779 (buffer)
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
780 register Lisp_Object buffer;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
781 {
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
782 register struct buffer *buf;
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 392
diff changeset
783 if (NILP (buffer))
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
784 buf = current_buffer;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
785 else
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
786 {
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
787 CHECK_BUFFER (buffer, 0);
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
788 buf = XBUFFER (buffer);
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
789 }
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
790
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
791 return make_number (BUF_MODIFF (buf));
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
792 }
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
793
392
dce611246f59 *** empty log message ***
Roland McGrath <roland@gnu.org>
parents: 333
diff changeset
794 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
795 "sRename buffer (to new name): \nP",
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
796 "Change current buffer's name to NEWNAME (a string).\n\
1876
0ddafa88e654 (Frename_buffer): Make prefix arg set UNIQUE.
Richard M. Stallman <rms@gnu.org>
parents: 1821
diff changeset
797 If second arg UNIQUE is nil or omitted, it is an error if a\n\
392
dce611246f59 *** empty log message ***
Roland McGrath <roland@gnu.org>
parents: 333
diff changeset
798 buffer named NEWNAME already exists.\n\
1876
0ddafa88e654 (Frename_buffer): Make prefix arg set UNIQUE.
Richard M. Stallman <rms@gnu.org>
parents: 1821
diff changeset
799 If UNIQUE is non-nil, come up with a new name using\n\
392
dce611246f59 *** empty log message ***
Roland McGrath <roland@gnu.org>
parents: 333
diff changeset
800 `generate-new-buffer-name'.\n\
1876
0ddafa88e654 (Frename_buffer): Make prefix arg set UNIQUE.
Richard M. Stallman <rms@gnu.org>
parents: 1821
diff changeset
801 Interactively, you can set UNIQUE with a prefix argument.\n\
0ddafa88e654 (Frename_buffer): Make prefix arg set UNIQUE.
Richard M. Stallman <rms@gnu.org>
parents: 1821
diff changeset
802 We return the name we actually gave the buffer.\n\
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
803 This does not change the name of the visited file (if any).")
9933
d3f22955b872 (Frename_buffer): Rename arg NAME to NEWNAME.
Richard M. Stallman <rms@gnu.org>
parents: 9922
diff changeset
804 (newname, unique)
d3f22955b872 (Frename_buffer): Rename arg NAME to NEWNAME.
Richard M. Stallman <rms@gnu.org>
parents: 9922
diff changeset
805 register Lisp_Object newname, unique;
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
806 {
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
807 register Lisp_Object tem, buf;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
808
9933
d3f22955b872 (Frename_buffer): Rename arg NAME to NEWNAME.
Richard M. Stallman <rms@gnu.org>
parents: 9922
diff changeset
809 CHECK_STRING (newname, 0);
d3f22955b872 (Frename_buffer): Rename arg NAME to NEWNAME.
Richard M. Stallman <rms@gnu.org>
parents: 9922
diff changeset
810
d3f22955b872 (Frename_buffer): Rename arg NAME to NEWNAME.
Richard M. Stallman <rms@gnu.org>
parents: 9922
diff changeset
811 if (XSTRING (newname)->size == 0)
7455
35657813817c (Frename_buffer): Reject empty string as new name.
Richard M. Stallman <rms@gnu.org>
parents: 7434
diff changeset
812 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
813
9933
d3f22955b872 (Frename_buffer): Rename arg NAME to NEWNAME.
Richard M. Stallman <rms@gnu.org>
parents: 9922
diff changeset
814 tem = Fget_buffer (newname);
5075
8deb7113bbdf (Frename_buffer): When the current buffer is already named NAME, don't
Roland McGrath <roland@gnu.org>
parents: 5074
diff changeset
815 /* Don't short-circuit if UNIQUE is t. That is a useful way to rename
8deb7113bbdf (Frename_buffer): When the current buffer is already named NAME, don't
Roland McGrath <roland@gnu.org>
parents: 5074
diff changeset
816 the buffer automatically so you can create another with the original name.
8deb7113bbdf (Frename_buffer): When the current buffer is already named NAME, don't
Roland McGrath <roland@gnu.org>
parents: 5074
diff changeset
817 It makes UNIQUE equivalent to
9933
d3f22955b872 (Frename_buffer): Rename arg NAME to NEWNAME.
Richard M. Stallman <rms@gnu.org>
parents: 9922
diff changeset
818 (rename-buffer (generate-new-buffer-name NEWNAME)). */
5075
8deb7113bbdf (Frename_buffer): When the current buffer is already named NAME, don't
Roland McGrath <roland@gnu.org>
parents: 5074
diff changeset
819 if (NILP (unique) && XBUFFER (tem) == current_buffer)
9939
686916b836b4 (Frename_buffer): Rename arg NAME to NEWNAME.
Richard M. Stallman <rms@gnu.org>
parents: 9933
diff changeset
820 return current_buffer->name;
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 392
diff changeset
821 if (!NILP (tem))
392
dce611246f59 *** empty log message ***
Roland McGrath <roland@gnu.org>
parents: 333
diff changeset
822 {
1876
0ddafa88e654 (Frename_buffer): Make prefix arg set UNIQUE.
Richard M. Stallman <rms@gnu.org>
parents: 1821
diff changeset
823 if (!NILP (unique))
9933
d3f22955b872 (Frename_buffer): Rename arg NAME to NEWNAME.
Richard M. Stallman <rms@gnu.org>
parents: 9922
diff changeset
824 newname = Fgenerate_new_buffer_name (newname, current_buffer->name);
392
dce611246f59 *** empty log message ***
Roland McGrath <roland@gnu.org>
parents: 333
diff changeset
825 else
9933
d3f22955b872 (Frename_buffer): Rename arg NAME to NEWNAME.
Richard M. Stallman <rms@gnu.org>
parents: 9922
diff changeset
826 error ("Buffer name `%s' is in use", XSTRING (newname)->data);
392
dce611246f59 *** empty log message ***
Roland McGrath <roland@gnu.org>
parents: 333
diff changeset
827 }
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
828
9933
d3f22955b872 (Frename_buffer): Rename arg NAME to NEWNAME.
Richard M. Stallman <rms@gnu.org>
parents: 9922
diff changeset
829 current_buffer->name = newname;
1707
86c951f6a444 * buffer.c (Frename_buffer): Set update_mode_lines.
Jim Blandy <jimb@redhat.com>
parents: 1586
diff changeset
830
86c951f6a444 * buffer.c (Frename_buffer): Set update_mode_lines.
Jim Blandy <jimb@redhat.com>
parents: 1586
diff changeset
831 /* 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
832 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
833 update_mode_lines++;
86c951f6a444 * buffer.c (Frename_buffer): Set update_mode_lines.
Jim Blandy <jimb@redhat.com>
parents: 1586
diff changeset
834
9262
582534b6e763 (Fget_buffer_create, Frename_buffer, Fbuffer_disable_undo,
Karl Heuer <kwzh@gnu.org>
parents: 9211
diff changeset
835 XSETBUFFER (buf, current_buffer);
9933
d3f22955b872 (Frename_buffer): Rename arg NAME to NEWNAME.
Richard M. Stallman <rms@gnu.org>
parents: 9922
diff changeset
836 Fsetcar (Frassq (buf, Vbuffer_alist), newname);
8599
cf3233d70e94 (Frename_buffer): Fix gcpro problems.
Karl Heuer <kwzh@gnu.org>
parents: 8550
diff changeset
837 if (NILP (current_buffer->filename)
cf3233d70e94 (Frename_buffer): Fix gcpro problems.
Karl Heuer <kwzh@gnu.org>
parents: 8550
diff changeset
838 && !NILP (current_buffer->auto_save_file_name))
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
839 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
840 /* 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
841 return current_buffer->name;
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
842 }
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
843
1281
1f6cfa3ea4cb * buffer.c (Fother_buffer): Add back the VISIBLE_OK argument. It
Jim Blandy <jimb@redhat.com>
parents: 1253
diff changeset
844 DEFUN ("other-buffer", Fother_buffer, Sother_buffer, 0, 2, 0,
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
845 "Return most recently selected buffer other than BUFFER.\n\
1281
1f6cfa3ea4cb * buffer.c (Fother_buffer): Add back the VISIBLE_OK argument. It
Jim Blandy <jimb@redhat.com>
parents: 1253
diff changeset
846 Buffers not visible in windows are preferred to visible buffers,\n\
1f6cfa3ea4cb * buffer.c (Fother_buffer): Add back the VISIBLE_OK argument. It
Jim Blandy <jimb@redhat.com>
parents: 1253
diff changeset
847 unless optional second argument VISIBLE-OK is non-nil.\n\
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
848 If no other buffer exists, the buffer `*scratch*' is returned.\n\
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
849 If BUFFER is omitted or nil, some interesting buffer is returned.")
1281
1f6cfa3ea4cb * buffer.c (Fother_buffer): Add back the VISIBLE_OK argument. It
Jim Blandy <jimb@redhat.com>
parents: 1253
diff changeset
850 (buffer, visible_ok)
1f6cfa3ea4cb * buffer.c (Fother_buffer): Add back the VISIBLE_OK argument. It
Jim Blandy <jimb@redhat.com>
parents: 1253
diff changeset
851 register Lisp_Object buffer, visible_ok;
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
852 {
14226
ad275aca6fc5 (Fother_buffer): If we have to create a new buffer, use
Karl Heuer <kwzh@gnu.org>
parents: 14186
diff changeset
853 Lisp_Object Fset_buffer_major_mode ();
17218
a57ca25e9c62 (reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents: 17124
diff changeset
854 register Lisp_Object tail, buf, notsogood, tem, pred, add_ons;
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
855 notsogood = Qnil;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
856
17218
a57ca25e9c62 (reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents: 17124
diff changeset
857 tail = Vbuffer_alist;
a57ca25e9c62 (reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents: 17124
diff changeset
858 pred = frame_buffer_predicate ();
a57ca25e9c62 (reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents: 17124
diff changeset
859
a57ca25e9c62 (reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents: 17124
diff changeset
860 /* 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
861 before other buffers. */
a57ca25e9c62 (reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents: 17124
diff changeset
862
a57ca25e9c62 (reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents: 17124
diff changeset
863 tem = frame_buffer_list ();
a57ca25e9c62 (reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents: 17124
diff changeset
864 add_ons = Qnil;
a57ca25e9c62 (reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents: 17124
diff changeset
865 while (CONSP (tem))
a57ca25e9c62 (reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents: 17124
diff changeset
866 {
a57ca25e9c62 (reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents: 17124
diff changeset
867 if (BUFFERP (XCONS (tem)->car))
a57ca25e9c62 (reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents: 17124
diff changeset
868 add_ons = Fcons (Fcons (Qnil, XCONS (tem)->car), add_ons);
a57ca25e9c62 (reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents: 17124
diff changeset
869 tem = XCONS (tem)->cdr;
a57ca25e9c62 (reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents: 17124
diff changeset
870 }
a57ca25e9c62 (reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents: 17124
diff changeset
871 tail = nconc2 (Fnreverse (add_ons), tail);
a57ca25e9c62 (reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents: 17124
diff changeset
872
a57ca25e9c62 (reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents: 17124
diff changeset
873 for (; !NILP (tail); tail = Fcdr (tail))
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
874 {
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
875 buf = Fcdr (Fcar (tail));
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
876 if (EQ (buf, buffer))
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
877 continue;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
878 if (XSTRING (XBUFFER (buf)->name)->data[0] == ' ')
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
879 continue;
10210
43e95429ffa0 (Fget_buffer_create): Copy the name, and clear text props.
Richard M. Stallman <rms@gnu.org>
parents: 10146
diff changeset
880 /* 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
881 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
882 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
883 {
17218
a57ca25e9c62 (reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents: 17124
diff changeset
884 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
885 if (NILP (tem))
43e95429ffa0 (Fget_buffer_create): Copy the name, and clear text props.
Richard M. Stallman <rms@gnu.org>
parents: 10146
diff changeset
886 continue;
43e95429ffa0 (Fget_buffer_create): Copy the name, and clear text props.
Richard M. Stallman <rms@gnu.org>
parents: 10146
diff changeset
887 }
43e95429ffa0 (Fget_buffer_create): Copy the name, and clear text props.
Richard M. Stallman <rms@gnu.org>
parents: 10146
diff changeset
888
1281
1f6cfa3ea4cb * buffer.c (Fother_buffer): Add back the VISIBLE_OK argument. It
Jim Blandy <jimb@redhat.com>
parents: 1253
diff changeset
889 if (NILP (visible_ok))
3802
594bc11c67ba Don't let the 'B' interactive spec default to buffers viewed in
Jim Blandy <jimb@redhat.com>
parents: 3785
diff changeset
890 tem = Fget_buffer_window (buf, Qt);
1281
1f6cfa3ea4cb * buffer.c (Fother_buffer): Add back the VISIBLE_OK argument. It
Jim Blandy <jimb@redhat.com>
parents: 1253
diff changeset
891 else
1f6cfa3ea4cb * buffer.c (Fother_buffer): Add back the VISIBLE_OK argument. It
Jim Blandy <jimb@redhat.com>
parents: 1253
diff changeset
892 tem = Qnil;
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 392
diff changeset
893 if (NILP (tem))
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
894 return buf;
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 392
diff changeset
895 if (NILP (notsogood))
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
896 notsogood = buf;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
897 }
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 392
diff changeset
898 if (!NILP (notsogood))
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
899 return notsogood;
14226
ad275aca6fc5 (Fother_buffer): If we have to create a new buffer, use
Karl Heuer <kwzh@gnu.org>
parents: 14186
diff changeset
900 buf = Fget_buffer_create (build_string ("*scratch*"));
ad275aca6fc5 (Fother_buffer): If we have to create a new buffer, use
Karl Heuer <kwzh@gnu.org>
parents: 14186
diff changeset
901 Fset_buffer_major_mode (buf);
ad275aca6fc5 (Fother_buffer): If we have to create a new buffer, use
Karl Heuer <kwzh@gnu.org>
parents: 14186
diff changeset
902 return buf;
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
903 }
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
904
12110
d7d7f15f3a92 (Fbuffer_disable_undo): Make this function interactive.
Karl Heuer <kwzh@gnu.org>
parents: 12101
diff changeset
905 DEFUN ("buffer-disable-undo", Fbuffer_disable_undo, Sbuffer_disable_undo,
d7d7f15f3a92 (Fbuffer_disable_undo): Make this function interactive.
Karl Heuer <kwzh@gnu.org>
parents: 12101
diff changeset
906 0, 1, "",
5247
0cf95629f6c4 (Fbuffer_disable_undo): Make arg optional.
Richard M. Stallman <rms@gnu.org>
parents: 5075
diff changeset
907 "Make BUFFER stop keeping undo information.\n\
0cf95629f6c4 (Fbuffer_disable_undo): Make arg optional.
Richard M. Stallman <rms@gnu.org>
parents: 5075
diff changeset
908 No argument or nil as argument means do this for the current buffer.")
648
70b112526394 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 585
diff changeset
909 (buffer)
70b112526394 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 585
diff changeset
910 register Lisp_Object buffer;
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
911 {
648
70b112526394 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 585
diff changeset
912 Lisp_Object real_buffer;
70b112526394 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 585
diff changeset
913
70b112526394 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 585
diff changeset
914 if (NILP (buffer))
9262
582534b6e763 (Fget_buffer_create, Frename_buffer, Fbuffer_disable_undo,
Karl Heuer <kwzh@gnu.org>
parents: 9211
diff changeset
915 XSETBUFFER (real_buffer, current_buffer);
648
70b112526394 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 585
diff changeset
916 else
70b112526394 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 585
diff changeset
917 {
70b112526394 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 585
diff changeset
918 real_buffer = Fget_buffer (buffer);
70b112526394 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 585
diff changeset
919 if (NILP (real_buffer))
70b112526394 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 585
diff changeset
920 nsberror (buffer);
70b112526394 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 585
diff changeset
921 }
70b112526394 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 585
diff changeset
922
70b112526394 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 585
diff changeset
923 XBUFFER (real_buffer)->undo_list = Qt;
70b112526394 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 585
diff changeset
924
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
925 return Qnil;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
926 }
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
927
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
928 DEFUN ("buffer-enable-undo", Fbuffer_enable_undo, Sbuffer_enable_undo,
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
929 0, 1, "",
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
930 "Start keeping undo information for buffer BUFFER.\n\
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
931 No argument or nil as argument means do this for the current buffer.")
648
70b112526394 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 585
diff changeset
932 (buffer)
70b112526394 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 585
diff changeset
933 register Lisp_Object buffer;
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
934 {
648
70b112526394 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 585
diff changeset
935 Lisp_Object real_buffer;
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
936
648
70b112526394 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 585
diff changeset
937 if (NILP (buffer))
9262
582534b6e763 (Fget_buffer_create, Frename_buffer, Fbuffer_disable_undo,
Karl Heuer <kwzh@gnu.org>
parents: 9211
diff changeset
938 XSETBUFFER (real_buffer, current_buffer);
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
939 else
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
940 {
648
70b112526394 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 585
diff changeset
941 real_buffer = Fget_buffer (buffer);
70b112526394 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 585
diff changeset
942 if (NILP (real_buffer))
70b112526394 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 585
diff changeset
943 nsberror (buffer);
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
944 }
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
945
648
70b112526394 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 585
diff changeset
946 if (EQ (XBUFFER (real_buffer)->undo_list, Qt))
70b112526394 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 585
diff changeset
947 XBUFFER (real_buffer)->undo_list = Qnil;
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
948
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
949 return Qnil;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
950 }
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
951
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
952 /*
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
953 DEFVAR_LISP ("kill-buffer-hook", no_cell, "\
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
954 Hook to be run (by `run-hooks', which see) when a buffer is killed.\n\
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
955 The buffer being killed will be current while the hook is running.\n\
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
956 See `kill-buffer'."
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
957 */
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
958 DEFUN ("kill-buffer", Fkill_buffer, Skill_buffer, 1, 1, "bKill buffer: ",
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
959 "Kill the buffer BUFFER.\n\
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
960 The argument may be a buffer or may be the name of a buffer.\n\
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
961 An argument of nil means kill the current buffer.\n\n\
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
962 Value is t if the buffer is actually killed, nil if user says no.\n\n\
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
963 The value of `kill-buffer-hook' (which may be local to that buffer),\n\
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
964 if not void, is a list of functions to be called, with no arguments,\n\
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
965 before the buffer is actually killed. The buffer to be killed is current\n\
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
966 when the hook functions are called.\n\n\
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
967 Any processes that have this buffer as the `process-buffer' are killed\n\
15421
2dc1a3e42a20 (Fkill_buffer): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 15307
diff changeset
968 with SIGHUP.")
13762
71c14edf7d6d (Fkill_buffer): Rename arg bufname to buffer.
Karl Heuer <kwzh@gnu.org>
parents: 13446
diff changeset
969 (buffer)
71c14edf7d6d (Fkill_buffer): Rename arg bufname to buffer.
Karl Heuer <kwzh@gnu.org>
parents: 13446
diff changeset
970 Lisp_Object buffer;
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
971 {
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
972 Lisp_Object buf;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
973 register struct buffer *b;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
974 register Lisp_Object tem;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
975 register struct Lisp_Marker *m;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
976 struct gcpro gcpro1, gcpro2;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
977
13762
71c14edf7d6d (Fkill_buffer): Rename arg bufname to buffer.
Karl Heuer <kwzh@gnu.org>
parents: 13446
diff changeset
978 if (NILP (buffer))
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
979 buf = Fcurrent_buffer ();
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
980 else
13762
71c14edf7d6d (Fkill_buffer): Rename arg bufname to buffer.
Karl Heuer <kwzh@gnu.org>
parents: 13446
diff changeset
981 buf = Fget_buffer (buffer);
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 392
diff changeset
982 if (NILP (buf))
13762
71c14edf7d6d (Fkill_buffer): Rename arg bufname to buffer.
Karl Heuer <kwzh@gnu.org>
parents: 13446
diff changeset
983 nsberror (buffer);
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
984
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
985 b = XBUFFER (buf);
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
986
12076
ee38e93ccf7e (Fkill_buffer): When killing indirect buffer,
Karl Heuer <kwzh@gnu.org>
parents: 11889
diff changeset
987 /* Avoid trouble for buffer already dead. */
ee38e93ccf7e (Fkill_buffer): When killing indirect buffer,
Karl Heuer <kwzh@gnu.org>
parents: 11889
diff changeset
988 if (NILP (b->name))
ee38e93ccf7e (Fkill_buffer): When killing indirect buffer,
Karl Heuer <kwzh@gnu.org>
parents: 11889
diff changeset
989 return Qnil;
ee38e93ccf7e (Fkill_buffer): When killing indirect buffer,
Karl Heuer <kwzh@gnu.org>
parents: 11889
diff changeset
990
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
991 /* Query if the buffer is still modified. */
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 392
diff changeset
992 if (INTERACTIVE && !NILP (b->filename)
10314
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
993 && BUF_MODIFF (b) > BUF_SAVE_MODIFF (b))
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
994 {
13762
71c14edf7d6d (Fkill_buffer): Rename arg bufname to buffer.
Karl Heuer <kwzh@gnu.org>
parents: 13446
diff changeset
995 GCPRO1 (buf);
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
996 tem = do_yes_or_no_p (format1 ("Buffer %s modified; kill anyway? ",
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
997 XSTRING (b->name)->data));
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
998 UNGCPRO;
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 392
diff changeset
999 if (NILP (tem))
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1000 return Qnil;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1001 }
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1002
6051
0b144d967f30 (Fkill_buffer): Call the Vkill_buffer_query_functions.
Richard M. Stallman <rms@gnu.org>
parents: 5904
diff changeset
1003 /* Run hooks with the buffer to be killed the current buffer. */
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1004 {
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1005 register Lisp_Object val;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1006 int count = specpdl_ptr - specpdl;
6051
0b144d967f30 (Fkill_buffer): Call the Vkill_buffer_query_functions.
Richard M. Stallman <rms@gnu.org>
parents: 5904
diff changeset
1007 Lisp_Object list;
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1008
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1009 record_unwind_protect (save_excursion_restore, save_excursion_save ());
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1010 set_buffer_internal (b);
6051
0b144d967f30 (Fkill_buffer): Call the Vkill_buffer_query_functions.
Richard M. Stallman <rms@gnu.org>
parents: 5904
diff changeset
1011
0b144d967f30 (Fkill_buffer): Call the Vkill_buffer_query_functions.
Richard M. Stallman <rms@gnu.org>
parents: 5904
diff changeset
1012 /* 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
1013 don't kill the buffer. */
0b144d967f30 (Fkill_buffer): Call the Vkill_buffer_query_functions.
Richard M. Stallman <rms@gnu.org>
parents: 5904
diff changeset
1014 for (list = Vkill_buffer_query_functions; !NILP (list); list = Fcdr (list))
0b144d967f30 (Fkill_buffer): Call the Vkill_buffer_query_functions.
Richard M. Stallman <rms@gnu.org>
parents: 5904
diff changeset
1015 {
0b144d967f30 (Fkill_buffer): Call the Vkill_buffer_query_functions.
Richard M. Stallman <rms@gnu.org>
parents: 5904
diff changeset
1016 tem = call0 (Fcar (list));
0b144d967f30 (Fkill_buffer): Call the Vkill_buffer_query_functions.
Richard M. Stallman <rms@gnu.org>
parents: 5904
diff changeset
1017 if (NILP (tem))
0b144d967f30 (Fkill_buffer): Call the Vkill_buffer_query_functions.
Richard M. Stallman <rms@gnu.org>
parents: 5904
diff changeset
1018 return unbind_to (count, Qnil);
0b144d967f30 (Fkill_buffer): Call the Vkill_buffer_query_functions.
Richard M. Stallman <rms@gnu.org>
parents: 5904
diff changeset
1019 }
0b144d967f30 (Fkill_buffer): Call the Vkill_buffer_query_functions.
Richard M. Stallman <rms@gnu.org>
parents: 5904
diff changeset
1020
0b144d967f30 (Fkill_buffer): Call the Vkill_buffer_query_functions.
Richard M. Stallman <rms@gnu.org>
parents: 5904
diff changeset
1021 /* Then run the hooks. */
6205
88e41d7d1e27 (Fkill_buffer, Fkill_all_local_variables):
Richard M. Stallman <rms@gnu.org>
parents: 6169
diff changeset
1022 if (!NILP (Vrun_hooks))
88e41d7d1e27 (Fkill_buffer, Fkill_all_local_variables):
Richard M. Stallman <rms@gnu.org>
parents: 6169
diff changeset
1023 call1 (Vrun_hooks, Qkill_buffer_hook);
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1024 unbind_to (count, Qnil);
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1025 }
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1026
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1027 /* We have no more questions to ask. Verify that it is valid
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1028 to kill the buffer. This must be done after the questions
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1029 since anything can happen within do_yes_or_no_p. */
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1030
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1031 /* Don't kill the minibuffer now current. */
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1032 if (EQ (buf, XWINDOW (minibuf_window)->buffer))
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1033 return Qnil;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1034
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 392
diff changeset
1035 if (NILP (b->name))
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1036 return Qnil;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1037
10314
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1038 /* 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
1039 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
1040 ask questions or their hooks get errors. */
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1041 if (! b->base_buffer)
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1042 {
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1043 struct buffer *other;
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1044
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1045 GCPRO1 (buf);
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1046
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1047 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
1048 /* all_buffers contains dead buffers too;
ee38e93ccf7e (Fkill_buffer): When killing indirect buffer,
Karl Heuer <kwzh@gnu.org>
parents: 11889
diff changeset
1049 don't re-kill them. */
ee38e93ccf7e (Fkill_buffer): When killing indirect buffer,
Karl Heuer <kwzh@gnu.org>
parents: 11889
diff changeset
1050 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
1051 {
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1052 Lisp_Object buf;
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1053 XSETBUFFER (buf, other);
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1054 Fkill_buffer (buf);
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1055 }
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1056
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1057 UNGCPRO;
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1058 }
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1059
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1060 /* Make this buffer not be current.
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1061 In the process, notice if this is the sole visible buffer
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1062 and give up if so. */
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1063 if (b == current_buffer)
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1064 {
1348
f6ab9d1e1709 (Fkill_buffer): Pass 2nd arg to Fother_buffer.
Richard M. Stallman <rms@gnu.org>
parents: 1308
diff changeset
1065 tem = Fother_buffer (buf, Qnil);
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1066 Fset_buffer (tem);
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1067 if (b == current_buffer)
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1068 return Qnil;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1069 }
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1070
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1071 /* Now there is no question: we can kill the buffer. */
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1072
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1073 #ifdef CLASH_DETECTION
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1074 /* Unlock this buffer's file, if it is locked. */
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1075 unlock_buffer (b);
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1076 #endif /* CLASH_DETECTION */
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1077
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1078 kill_buffer_processes (buf);
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1079
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1080 tem = Vinhibit_quit;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1081 Vinhibit_quit = Qt;
13922
5636ed4243ec (Fkill_buffer): Delete buffer from Vbuffer_alist after replacing it.
Erik Naggum <erik@naggum.no>
parents: 13917
diff changeset
1082 replace_buffer_in_all_windows (buf);
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1083 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
1084 frames_discard_buffer (buf);
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1085 Vinhibit_quit = tem;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1086
7994
c5b7f74b5023 (Fkill_buffer): Don't delete auto save file
Richard M. Stallman <rms@gnu.org>
parents: 7985
diff changeset
1087 /* Delete any auto-save file, if we saved it in this session. */
9146
8f966cc4652b (nsberror, Fget_buffer, Fget_file_buffer, Fbuffer_local_variables,
Karl Heuer <kwzh@gnu.org>
parents: 9047
diff changeset
1088 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
1089 && b->auto_save_modified != 0
86fef98acedc (Fkill_buffer): Don't kill auto save file if not recent.
Richard M. Stallman <rms@gnu.org>
parents: 13169
diff changeset
1090 && SAVE_MODIFF < b->auto_save_modified)
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1091 {
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1092 Lisp_Object tem;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1093 tem = Fsymbol_value (intern ("delete-auto-save-files"));
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 392
diff changeset
1094 if (! NILP (tem))
10082
8d3a71736423 (Fkill_buffer): Use internal_delete_file.
Richard M. Stallman <rms@gnu.org>
parents: 9950
diff changeset
1095 internal_delete_file (b->auto_save_file_name);
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1096 }
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1097
12076
ee38e93ccf7e (Fkill_buffer): When killing indirect buffer,
Karl Heuer <kwzh@gnu.org>
parents: 11889
diff changeset
1098 if (b->base_buffer)
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1099 {
12076
ee38e93ccf7e (Fkill_buffer): When killing indirect buffer,
Karl Heuer <kwzh@gnu.org>
parents: 11889
diff changeset
1100 /* 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
1101 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
1102 or its other indirect buffers. */
ee38e93ccf7e (Fkill_buffer): When killing indirect buffer,
Karl Heuer <kwzh@gnu.org>
parents: 11889
diff changeset
1103 for (tem = BUF_MARKERS (b); !NILP (tem); )
ee38e93ccf7e (Fkill_buffer): When killing indirect buffer,
Karl Heuer <kwzh@gnu.org>
parents: 11889
diff changeset
1104 {
ee38e93ccf7e (Fkill_buffer): When killing indirect buffer,
Karl Heuer <kwzh@gnu.org>
parents: 11889
diff changeset
1105 Lisp_Object next;
ee38e93ccf7e (Fkill_buffer): When killing indirect buffer,
Karl Heuer <kwzh@gnu.org>
parents: 11889
diff changeset
1106 m = XMARKER (tem);
ee38e93ccf7e (Fkill_buffer): When killing indirect buffer,
Karl Heuer <kwzh@gnu.org>
parents: 11889
diff changeset
1107 next = m->chain;
ee38e93ccf7e (Fkill_buffer): When killing indirect buffer,
Karl Heuer <kwzh@gnu.org>
parents: 11889
diff changeset
1108 if (m->buffer == b)
ee38e93ccf7e (Fkill_buffer): When killing indirect buffer,
Karl Heuer <kwzh@gnu.org>
parents: 11889
diff changeset
1109 unchain_marker (tem);
ee38e93ccf7e (Fkill_buffer): When killing indirect buffer,
Karl Heuer <kwzh@gnu.org>
parents: 11889
diff changeset
1110 tem = next;
ee38e93ccf7e (Fkill_buffer): When killing indirect buffer,
Karl Heuer <kwzh@gnu.org>
parents: 11889
diff changeset
1111 }
ee38e93ccf7e (Fkill_buffer): When killing indirect buffer,
Karl Heuer <kwzh@gnu.org>
parents: 11889
diff changeset
1112 }
ee38e93ccf7e (Fkill_buffer): When killing indirect buffer,
Karl Heuer <kwzh@gnu.org>
parents: 11889
diff changeset
1113 else
ee38e93ccf7e (Fkill_buffer): When killing indirect buffer,
Karl Heuer <kwzh@gnu.org>
parents: 11889
diff changeset
1114 {
ee38e93ccf7e (Fkill_buffer): When killing indirect buffer,
Karl Heuer <kwzh@gnu.org>
parents: 11889
diff changeset
1115 /* 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
1116 and leave them pointing nowhere. */
12076
ee38e93ccf7e (Fkill_buffer): When killing indirect buffer,
Karl Heuer <kwzh@gnu.org>
parents: 11889
diff changeset
1117 for (tem = BUF_MARKERS (b); !NILP (tem); )
10314
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1118 {
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1119 m = XMARKER (tem);
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1120 m->buffer = 0;
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1121 tem = m->chain;
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1122 m->chain = Qnil;
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1123 }
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1124 BUF_MARKERS (b) = Qnil;
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1125
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1126 #ifdef USE_TEXT_PROPERTIES
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1127 BUF_INTERVALS (b) = NULL_INTERVAL;
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1128 #endif
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1129
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1130 /* Perhaps we should explicitly free the interval tree here... */
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1131 }
1291
7c32612174c3 * buffer.c (reset_buffer): Do INITIALIZE_INTERVAL on the buffer's
Joseph Arceneaux <jla@gnu.org>
parents: 1281
diff changeset
1132
11214
b880572ce431 (Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents: 11112
diff changeset
1133 /* 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
1134 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
1135 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
1136 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
1137 swap_out_buffer_local_variables (b);
15776
6018e01d4466 (buffer_permanent_local_flags): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 15638
diff changeset
1138 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
1139
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1140 b->name = Qnil;
10314
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1141
2439
b6c62e4abf59 Put interrupt input blocking in a separate file from xterm.h.
Jim Blandy <jimb@redhat.com>
parents: 2389
diff changeset
1142 BLOCK_INPUT;
10314
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1143 if (! b->base_buffer)
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1144 BUFFER_FREE (BUF_BEG_ADDR (b));
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1145
9403
9f797989b817 * buffer.c: #include region-cache.h.
Jim Blandy <jimb@redhat.com>
parents: 9362
diff changeset
1146 if (b->newline_cache)
9f797989b817 * buffer.c: #include region-cache.h.
Jim Blandy <jimb@redhat.com>
parents: 9362
diff changeset
1147 {
9f797989b817 * buffer.c: #include region-cache.h.
Jim Blandy <jimb@redhat.com>
parents: 9362
diff changeset
1148 free_region_cache (b->newline_cache);
9f797989b817 * buffer.c: #include region-cache.h.
Jim Blandy <jimb@redhat.com>
parents: 9362
diff changeset
1149 b->newline_cache = 0;
9f797989b817 * buffer.c: #include region-cache.h.
Jim Blandy <jimb@redhat.com>
parents: 9362
diff changeset
1150 }
9f797989b817 * buffer.c: #include region-cache.h.
Jim Blandy <jimb@redhat.com>
parents: 9362
diff changeset
1151 if (b->width_run_cache)
9f797989b817 * buffer.c: #include region-cache.h.
Jim Blandy <jimb@redhat.com>
parents: 9362
diff changeset
1152 {
9f797989b817 * buffer.c: #include region-cache.h.
Jim Blandy <jimb@redhat.com>
parents: 9362
diff changeset
1153 free_region_cache (b->width_run_cache);
9f797989b817 * buffer.c: #include region-cache.h.
Jim Blandy <jimb@redhat.com>
parents: 9362
diff changeset
1154 b->width_run_cache = 0;
9f797989b817 * buffer.c: #include region-cache.h.
Jim Blandy <jimb@redhat.com>
parents: 9362
diff changeset
1155 }
9f797989b817 * buffer.c: #include region-cache.h.
Jim Blandy <jimb@redhat.com>
parents: 9362
diff changeset
1156 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
1157 UNBLOCK_INPUT;
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1158 b->undo_list = Qnil;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1159
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1160 return Qt;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1161 }
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1162
550
3072b38789a7 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 485
diff changeset
1163 /* Move the assoc for buffer BUF to the front of buffer-alist. Since
3072b38789a7 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 485
diff changeset
1164 we do this each time BUF is selected visibly, the more recently
3072b38789a7 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 485
diff changeset
1165 selected buffers are always closer to the front of the list. This
3072b38789a7 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 485
diff changeset
1166 means that other_buffer is more likely to choose a relevant buffer. */
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1167
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1168 record_buffer (buf)
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1169 Lisp_Object buf;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1170 {
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1171 register Lisp_Object link, prev;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1172
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1173 prev = Qnil;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1174 for (link = Vbuffer_alist; CONSP (link); link = XCONS (link)->cdr)
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1175 {
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1176 if (EQ (XCONS (XCONS (link)->car)->cdr, buf))
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1177 break;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1178 prev = link;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1179 }
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1180
550
3072b38789a7 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 485
diff changeset
1181 /* Effectively do Vbuffer_alist = Fdelq (link, Vbuffer_alist);
3072b38789a7 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 485
diff changeset
1182 we cannot use Fdelq itself here because it allows quitting. */
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1183
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 392
diff changeset
1184 if (NILP (prev))
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1185 Vbuffer_alist = XCONS (Vbuffer_alist)->cdr;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1186 else
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1187 XCONS (prev)->cdr = XCONS (XCONS (prev)->cdr)->cdr;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1188
17218
a57ca25e9c62 (reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents: 17124
diff changeset
1189 XCONS (link)->cdr = Vbuffer_alist;
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1190 Vbuffer_alist = link;
17218
a57ca25e9c62 (reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents: 17124
diff changeset
1191
a57ca25e9c62 (reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents: 17124
diff changeset
1192 /* 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
1193
a57ca25e9c62 (reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents: 17124
diff changeset
1194 prev = Qnil;
a57ca25e9c62 (reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents: 17124
diff changeset
1195 for (link = frame_buffer_list (); CONSP (link); link = XCONS (link)->cdr)
a57ca25e9c62 (reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents: 17124
diff changeset
1196 {
a57ca25e9c62 (reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents: 17124
diff changeset
1197 if (EQ (XCONS (link)->car, buf))
a57ca25e9c62 (reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents: 17124
diff changeset
1198 break;
a57ca25e9c62 (reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents: 17124
diff changeset
1199 prev = link;
a57ca25e9c62 (reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents: 17124
diff changeset
1200 }
a57ca25e9c62 (reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents: 17124
diff changeset
1201
a57ca25e9c62 (reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents: 17124
diff changeset
1202 /* Effectively do delq. */
a57ca25e9c62 (reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents: 17124
diff changeset
1203
a57ca25e9c62 (reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents: 17124
diff changeset
1204 if (CONSP (link))
a57ca25e9c62 (reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents: 17124
diff changeset
1205 {
a57ca25e9c62 (reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents: 17124
diff changeset
1206 if (NILP (prev))
a57ca25e9c62 (reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents: 17124
diff changeset
1207 set_frame_buffer_list (XCONS (frame_buffer_list ())->cdr);
a57ca25e9c62 (reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents: 17124
diff changeset
1208 else
a57ca25e9c62 (reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents: 17124
diff changeset
1209 XCONS (prev)->cdr = XCONS (XCONS (prev)->cdr)->cdr;
a57ca25e9c62 (reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents: 17124
diff changeset
1210
a57ca25e9c62 (reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents: 17124
diff changeset
1211 XCONS (link)->cdr = frame_buffer_list ();
a57ca25e9c62 (reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents: 17124
diff changeset
1212 set_frame_buffer_list (link);
a57ca25e9c62 (reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents: 17124
diff changeset
1213 }
a57ca25e9c62 (reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents: 17124
diff changeset
1214 else
a57ca25e9c62 (reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents: 17124
diff changeset
1215 set_frame_buffer_list (Fcons (buf, frame_buffer_list ()));
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1216 }
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1217
9732
577db538b0b6 (Fset_buffer_major_mode): New function. Set the default major mode here.
Karl Heuer <kwzh@gnu.org>
parents: 9632
diff changeset
1218 DEFUN ("set-buffer-major-mode", Fset_buffer_major_mode, Sset_buffer_major_mode, 1, 1, 0,
577db538b0b6 (Fset_buffer_major_mode): New function. Set the default major mode here.
Karl Heuer <kwzh@gnu.org>
parents: 9632
diff changeset
1219 "Set an appropriate major mode for BUFFER, according to `default-major-mode'.\n\
577db538b0b6 (Fset_buffer_major_mode): New function. Set the default major mode here.
Karl Heuer <kwzh@gnu.org>
parents: 9632
diff changeset
1220 Use this function before selecting the buffer, since it may need to inspect\n\
577db538b0b6 (Fset_buffer_major_mode): New function. Set the default major mode here.
Karl Heuer <kwzh@gnu.org>
parents: 9632
diff changeset
1221 the current buffer's major mode.")
14060
b62397f49a24 (Fmake_indirect_buffer, Fset_buffer_major_mode, Fpop_to_buffer,
Erik Naggum <erik@naggum.no>
parents: 13922
diff changeset
1222 (buffer)
b62397f49a24 (Fmake_indirect_buffer, Fset_buffer_major_mode, Fpop_to_buffer,
Erik Naggum <erik@naggum.no>
parents: 13922
diff changeset
1223 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
1224 {
577db538b0b6 (Fset_buffer_major_mode): New function. Set the default major mode here.
Karl Heuer <kwzh@gnu.org>
parents: 9632
diff changeset
1225 int count;
577db538b0b6 (Fset_buffer_major_mode): New function. Set the default major mode here.
Karl Heuer <kwzh@gnu.org>
parents: 9632
diff changeset
1226 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
1227
577db538b0b6 (Fset_buffer_major_mode): New function. Set the default major mode here.
Karl Heuer <kwzh@gnu.org>
parents: 9632
diff changeset
1228 function = buffer_defaults.major_mode;
577db538b0b6 (Fset_buffer_major_mode): New function. Set the default major mode here.
Karl Heuer <kwzh@gnu.org>
parents: 9632
diff changeset
1229 if (NILP (function) && NILP (Fget (current_buffer->major_mode, Qmode_class)))
577db538b0b6 (Fset_buffer_major_mode): New function. Set the default major mode here.
Karl Heuer <kwzh@gnu.org>
parents: 9632
diff changeset
1230 function = current_buffer->major_mode;
577db538b0b6 (Fset_buffer_major_mode): New function. Set the default major mode here.
Karl Heuer <kwzh@gnu.org>
parents: 9632
diff changeset
1231
577db538b0b6 (Fset_buffer_major_mode): New function. Set the default major mode here.
Karl Heuer <kwzh@gnu.org>
parents: 9632
diff changeset
1232 if (NILP (function) || EQ (function, Qfundamental_mode))
577db538b0b6 (Fset_buffer_major_mode): New function. Set the default major mode here.
Karl Heuer <kwzh@gnu.org>
parents: 9632
diff changeset
1233 return Qnil;
577db538b0b6 (Fset_buffer_major_mode): New function. Set the default major mode here.
Karl Heuer <kwzh@gnu.org>
parents: 9632
diff changeset
1234
577db538b0b6 (Fset_buffer_major_mode): New function. Set the default major mode here.
Karl Heuer <kwzh@gnu.org>
parents: 9632
diff changeset
1235 count = specpdl_ptr - specpdl;
577db538b0b6 (Fset_buffer_major_mode): New function. Set the default major mode here.
Karl Heuer <kwzh@gnu.org>
parents: 9632
diff changeset
1236
577db538b0b6 (Fset_buffer_major_mode): New function. Set the default major mode here.
Karl Heuer <kwzh@gnu.org>
parents: 9632
diff changeset
1237 /* To select a nonfundamental mode,
577db538b0b6 (Fset_buffer_major_mode): New function. Set the default major mode here.
Karl Heuer <kwzh@gnu.org>
parents: 9632
diff changeset
1238 select the buffer temporarily and then call the mode function. */
577db538b0b6 (Fset_buffer_major_mode): New function. Set the default major mode here.
Karl Heuer <kwzh@gnu.org>
parents: 9632
diff changeset
1239
577db538b0b6 (Fset_buffer_major_mode): New function. Set the default major mode here.
Karl Heuer <kwzh@gnu.org>
parents: 9632
diff changeset
1240 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
1241
14060
b62397f49a24 (Fmake_indirect_buffer, Fset_buffer_major_mode, Fpop_to_buffer,
Erik Naggum <erik@naggum.no>
parents: 13922
diff changeset
1242 Fset_buffer (buffer);
9732
577db538b0b6 (Fset_buffer_major_mode): New function. Set the default major mode here.
Karl Heuer <kwzh@gnu.org>
parents: 9632
diff changeset
1243 call0 (function);
577db538b0b6 (Fset_buffer_major_mode): New function. Set the default major mode here.
Karl Heuer <kwzh@gnu.org>
parents: 9632
diff changeset
1244
577db538b0b6 (Fset_buffer_major_mode): New function. Set the default major mode here.
Karl Heuer <kwzh@gnu.org>
parents: 9632
diff changeset
1245 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
1246 }
577db538b0b6 (Fset_buffer_major_mode): New function. Set the default major mode here.
Karl Heuer <kwzh@gnu.org>
parents: 9632
diff changeset
1247
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1248 DEFUN ("switch-to-buffer", Fswitch_to_buffer, Sswitch_to_buffer, 1, 2, "BSwitch to buffer: ",
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1249 "Select buffer BUFFER in the current window.\n\
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1250 BUFFER may be a buffer or a buffer name.\n\
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1251 Optional second arg NORECORD non-nil means\n\
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1252 do not put this buffer at the front of the list of recently selected ones.\n\
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1253 \n\
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1254 WARNING: This is NOT the way to work on another buffer temporarily\n\
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1255 within a Lisp program! Use `set-buffer' instead. That avoids messing with\n\
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1256 the window-buffer correspondences.")
13762
71c14edf7d6d (Fkill_buffer): Rename arg bufname to buffer.
Karl Heuer <kwzh@gnu.org>
parents: 13446
diff changeset
1257 (buffer, norecord)
71c14edf7d6d (Fkill_buffer): Rename arg bufname to buffer.
Karl Heuer <kwzh@gnu.org>
parents: 13446
diff changeset
1258 Lisp_Object buffer, norecord;
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1259 {
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1260 register Lisp_Object buf;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1261 Lisp_Object tem;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1262
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1263 if (EQ (minibuf_window, selected_window))
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1264 error ("Cannot switch buffers in minibuffer window");
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1265 tem = Fwindow_dedicated_p (selected_window);
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 392
diff changeset
1266 if (!NILP (tem))
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1267 error ("Cannot switch buffers in a dedicated window");
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1268
13762
71c14edf7d6d (Fkill_buffer): Rename arg bufname to buffer.
Karl Heuer <kwzh@gnu.org>
parents: 13446
diff changeset
1269 if (NILP (buffer))
1348
f6ab9d1e1709 (Fkill_buffer): Pass 2nd arg to Fother_buffer.
Richard M. Stallman <rms@gnu.org>
parents: 1308
diff changeset
1270 buf = Fother_buffer (Fcurrent_buffer (), Qnil);
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1271 else
9732
577db538b0b6 (Fset_buffer_major_mode): New function. Set the default major mode here.
Karl Heuer <kwzh@gnu.org>
parents: 9632
diff changeset
1272 {
13762
71c14edf7d6d (Fkill_buffer): Rename arg bufname to buffer.
Karl Heuer <kwzh@gnu.org>
parents: 13446
diff changeset
1273 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
1274 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
1275 {
13762
71c14edf7d6d (Fkill_buffer): Rename arg bufname to buffer.
Karl Heuer <kwzh@gnu.org>
parents: 13446
diff changeset
1276 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
1277 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
1278 }
577db538b0b6 (Fset_buffer_major_mode): New function. Set the default major mode here.
Karl Heuer <kwzh@gnu.org>
parents: 9632
diff changeset
1279 }
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1280 Fset_buffer (buf);
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 392
diff changeset
1281 if (NILP (norecord))
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1282 record_buffer (buf);
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1283
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1284 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
1285 ? 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
1286 : selected_window,
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1287 buf);
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1288
16840
299b0e0f0a93 Fix typo editing previous change.
Richard M. Stallman <rms@gnu.org>
parents: 16830
diff changeset
1289 return buf;
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1290 }
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1291
16840
299b0e0f0a93 Fix typo editing previous change.
Richard M. Stallman <rms@gnu.org>
parents: 16830
diff changeset
1292 DEFUN ("pop-to-buffer", Fpop_to_buffer, Spop_to_buffer, 1, 3, 0,
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1293 "Select buffer BUFFER in some window, preferably a different one.\n\
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1294 If BUFFER is nil, then some other buffer is chosen.\n\
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1295 If `pop-up-windows' is non-nil, windows can be split to do this.\n\
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1296 If optional second arg OTHER-WINDOW is non-nil, insist on finding another\n\
15307
08ce5fa97ce3 (Fpop_to_buffer): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 15122
diff changeset
1297 window even if BUFFER is already visible in the selected window.\n\
08ce5fa97ce3 (Fpop_to_buffer): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 15122
diff changeset
1298 This uses the function `display-buffer' as a subroutine; see the documentation\n\
16830
4792e73d511f (Fpop_to_buffer): New arg NORECORD.
Richard M. Stallman <rms@gnu.org>
parents: 16665
diff changeset
1299 of `display-buffer' for additional customization information.\n\
4792e73d511f (Fpop_to_buffer): New arg NORECORD.
Richard M. Stallman <rms@gnu.org>
parents: 16665
diff changeset
1300 \n\
4792e73d511f (Fpop_to_buffer): New arg NORECORD.
Richard M. Stallman <rms@gnu.org>
parents: 16665
diff changeset
1301 Optional third arg NORECORD non-nil means\n\
4792e73d511f (Fpop_to_buffer): New arg NORECORD.
Richard M. Stallman <rms@gnu.org>
parents: 16665
diff changeset
1302 do not put this buffer at the front of the list of recently selected ones.")
4792e73d511f (Fpop_to_buffer): New arg NORECORD.
Richard M. Stallman <rms@gnu.org>
parents: 16665
diff changeset
1303 (buffer, other_window, norecord)
4792e73d511f (Fpop_to_buffer): New arg NORECORD.
Richard M. Stallman <rms@gnu.org>
parents: 16665
diff changeset
1304 Lisp_Object buffer, other_window, norecord;
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1305 {
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1306 register Lisp_Object buf;
13762
71c14edf7d6d (Fkill_buffer): Rename arg bufname to buffer.
Karl Heuer <kwzh@gnu.org>
parents: 13446
diff changeset
1307 if (NILP (buffer))
1348
f6ab9d1e1709 (Fkill_buffer): Pass 2nd arg to Fother_buffer.
Richard M. Stallman <rms@gnu.org>
parents: 1308
diff changeset
1308 buf = Fother_buffer (Fcurrent_buffer (), Qnil);
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1309 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
1310 {
13762
71c14edf7d6d (Fkill_buffer): Rename arg bufname to buffer.
Karl Heuer <kwzh@gnu.org>
parents: 13446
diff changeset
1311 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
1312 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
1313 {
13762
71c14edf7d6d (Fkill_buffer): Rename arg bufname to buffer.
Karl Heuer <kwzh@gnu.org>
parents: 13446
diff changeset
1314 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
1315 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
1316 }
3aea65d9eb68 (Fpop_to_buffer): Call Fset_buffer_major_mode if we create a buffer.
Richard M. Stallman <rms@gnu.org>
parents: 10751
diff changeset
1317 }
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1318 Fset_buffer (buf);
16830
4792e73d511f (Fpop_to_buffer): New arg NORECORD.
Richard M. Stallman <rms@gnu.org>
parents: 16665
diff changeset
1319 if (NILP (norecord))
4792e73d511f (Fpop_to_buffer): New arg NORECORD.
Richard M. Stallman <rms@gnu.org>
parents: 16665
diff changeset
1320 record_buffer (buf);
14060
b62397f49a24 (Fmake_indirect_buffer, Fset_buffer_major_mode, Fpop_to_buffer,
Erik Naggum <erik@naggum.no>
parents: 13922
diff changeset
1321 Fselect_window (Fdisplay_buffer (buf, other_window));
3295
4d405f172c79 (reset_buffer): Clear mark_active field here.
Richard M. Stallman <rms@gnu.org>
parents: 3242
diff changeset
1322 return buf;
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1323 }
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1324
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1325 DEFUN ("current-buffer", Fcurrent_buffer, Scurrent_buffer, 0, 0, 0,
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1326 "Return the current buffer as a Lisp object.")
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1327 ()
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1328 {
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1329 register Lisp_Object buf;
9262
582534b6e763 (Fget_buffer_create, Frename_buffer, Fbuffer_disable_undo,
Karl Heuer <kwzh@gnu.org>
parents: 9211
diff changeset
1330 XSETBUFFER (buf, current_buffer);
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1331 return buf;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1332 }
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1333
11889
1067ddd12dfc (set_buffer_internal_1): New subroutine.
Karl Heuer <kwzh@gnu.org>
parents: 11838
diff changeset
1334 /* Set the current buffer to B. */
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1335
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1336 void
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1337 set_buffer_internal (b)
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1338 register struct buffer *b;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1339 {
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1340 register struct buffer *old_buf;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1341 register Lisp_Object tail, valcontents;
9146
8f966cc4652b (nsberror, Fget_buffer, Fget_file_buffer, Fbuffer_local_variables,
Karl Heuer <kwzh@gnu.org>
parents: 9047
diff changeset
1342 Lisp_Object tem;
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1343
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1344 if (current_buffer == b)
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1345 return;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1346
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1347 windows_or_buffers_changed = 1;
11889
1067ddd12dfc (set_buffer_internal_1): New subroutine.
Karl Heuer <kwzh@gnu.org>
parents: 11838
diff changeset
1348 set_buffer_internal_1 (b);
1067ddd12dfc (set_buffer_internal_1): New subroutine.
Karl Heuer <kwzh@gnu.org>
parents: 11838
diff changeset
1349 }
1067ddd12dfc (set_buffer_internal_1): New subroutine.
Karl Heuer <kwzh@gnu.org>
parents: 11838
diff changeset
1350
1067ddd12dfc (set_buffer_internal_1): New subroutine.
Karl Heuer <kwzh@gnu.org>
parents: 11838
diff changeset
1351 /* 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
1352 This is used by redisplay. */
1067ddd12dfc (set_buffer_internal_1): New subroutine.
Karl Heuer <kwzh@gnu.org>
parents: 11838
diff changeset
1353
1067ddd12dfc (set_buffer_internal_1): New subroutine.
Karl Heuer <kwzh@gnu.org>
parents: 11838
diff changeset
1354 void
1067ddd12dfc (set_buffer_internal_1): New subroutine.
Karl Heuer <kwzh@gnu.org>
parents: 11838
diff changeset
1355 set_buffer_internal_1 (b)
1067ddd12dfc (set_buffer_internal_1): New subroutine.
Karl Heuer <kwzh@gnu.org>
parents: 11838
diff changeset
1356 register struct buffer *b;
1067ddd12dfc (set_buffer_internal_1): New subroutine.
Karl Heuer <kwzh@gnu.org>
parents: 11838
diff changeset
1357 {
1067ddd12dfc (set_buffer_internal_1): New subroutine.
Karl Heuer <kwzh@gnu.org>
parents: 11838
diff changeset
1358 register struct buffer *old_buf;
1067ddd12dfc (set_buffer_internal_1): New subroutine.
Karl Heuer <kwzh@gnu.org>
parents: 11838
diff changeset
1359 register Lisp_Object tail, valcontents;
1067ddd12dfc (set_buffer_internal_1): New subroutine.
Karl Heuer <kwzh@gnu.org>
parents: 11838
diff changeset
1360 Lisp_Object tem;
1067ddd12dfc (set_buffer_internal_1): New subroutine.
Karl Heuer <kwzh@gnu.org>
parents: 11838
diff changeset
1361
1067ddd12dfc (set_buffer_internal_1): New subroutine.
Karl Heuer <kwzh@gnu.org>
parents: 11838
diff changeset
1362 if (current_buffer == b)
1067ddd12dfc (set_buffer_internal_1): New subroutine.
Karl Heuer <kwzh@gnu.org>
parents: 11838
diff changeset
1363 return;
1067ddd12dfc (set_buffer_internal_1): New subroutine.
Karl Heuer <kwzh@gnu.org>
parents: 11838
diff changeset
1364
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1365 old_buf = current_buffer;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1366 current_buffer = b;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1367 last_known_column_point = -1; /* invalidate indentation cache */
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1368
10314
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1369 if (old_buf)
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1370 {
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1371 /* 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
1372 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
1373 if (old_buf->base_buffer)
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1374 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
1375
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1376 /* 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
1377 when it is not current, update them now. */
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1378 if (! NILP (old_buf->pt_marker))
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1379 {
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1380 Lisp_Object obuf;
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1381 XSETBUFFER (obuf, old_buf);
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1382 Fset_marker (old_buf->pt_marker, BUF_PT (old_buf), obuf);
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1383 }
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1384 if (! NILP (old_buf->begv_marker))
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1385 {
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1386 Lisp_Object obuf;
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1387 XSETBUFFER (obuf, old_buf);
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1388 Fset_marker (old_buf->begv_marker, BUF_BEGV (old_buf), obuf);
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1389 }
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1390 if (! NILP (old_buf->zv_marker))
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1391 {
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1392 Lisp_Object obuf;
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1393 XSETBUFFER (obuf, old_buf);
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1394 Fset_marker (old_buf->zv_marker, BUF_ZV (old_buf), obuf);
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1395 }
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1396 }
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1397
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1398 /* 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
1399 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
1400 if (b->base_buffer)
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1401 b->undo_list = b->base_buffer->undo_list;
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1402
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1403 /* 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
1404 when it is not current, fetch them now. */
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1405 if (! NILP (b->pt_marker))
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1406 BUF_PT (b) = marker_position (b->pt_marker);
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1407 if (! NILP (b->begv_marker))
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1408 BUF_BEGV (b) = marker_position (b->begv_marker);
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1409 if (! NILP (b->zv_marker))
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1410 BUF_ZV (b) = marker_position (b->zv_marker);
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1411
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1412 /* Look down buffer's list of local Lisp variables
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1413 to find and update any that forward into C variables. */
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1414
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 392
diff changeset
1415 for (tail = b->local_var_alist; !NILP (tail); tail = XCONS (tail)->cdr)
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1416 {
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1417 valcontents = XSYMBOL (XCONS (XCONS (tail)->car)->car)->value;
9146
8f966cc4652b (nsberror, Fget_buffer, Fget_file_buffer, Fbuffer_local_variables,
Karl Heuer <kwzh@gnu.org>
parents: 9047
diff changeset
1418 if ((BUFFER_LOCAL_VALUEP (valcontents)
8f966cc4652b (nsberror, Fget_buffer, Fget_file_buffer, Fbuffer_local_variables,
Karl Heuer <kwzh@gnu.org>
parents: 9047
diff changeset
1419 || SOME_BUFFER_LOCAL_VALUEP (valcontents))
9892
beb59716f299 (set_buffer_internal): Use XBUFFER_LOCAL_VALUE, not XCONS.
Karl Heuer <kwzh@gnu.org>
parents: 9810
diff changeset
1420 && (tem = XBUFFER_LOCAL_VALUE (valcontents)->car,
9146
8f966cc4652b (nsberror, Fget_buffer, Fget_file_buffer, Fbuffer_local_variables,
Karl Heuer <kwzh@gnu.org>
parents: 9047
diff changeset
1421 (BOOLFWDP (tem) || INTFWDP (tem) || OBJFWDP (tem))))
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1422 /* Just reference the variable
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1423 to cause it to become set for this buffer. */
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1424 Fsymbol_value (XCONS (XCONS (tail)->car)->car);
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1425 }
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1426
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1427 /* Do the same with any others that were local to the previous buffer */
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1428
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1429 if (old_buf)
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 392
diff changeset
1430 for (tail = old_buf->local_var_alist; !NILP (tail); tail = XCONS (tail)->cdr)
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1431 {
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1432 valcontents = XSYMBOL (XCONS (XCONS (tail)->car)->car)->value;
9146
8f966cc4652b (nsberror, Fget_buffer, Fget_file_buffer, Fbuffer_local_variables,
Karl Heuer <kwzh@gnu.org>
parents: 9047
diff changeset
1433 if ((BUFFER_LOCAL_VALUEP (valcontents)
8f966cc4652b (nsberror, Fget_buffer, Fget_file_buffer, Fbuffer_local_variables,
Karl Heuer <kwzh@gnu.org>
parents: 9047
diff changeset
1434 || SOME_BUFFER_LOCAL_VALUEP (valcontents))
9892
beb59716f299 (set_buffer_internal): Use XBUFFER_LOCAL_VALUE, not XCONS.
Karl Heuer <kwzh@gnu.org>
parents: 9810
diff changeset
1435 && (tem = XBUFFER_LOCAL_VALUE (valcontents)->car,
9146
8f966cc4652b (nsberror, Fget_buffer, Fget_file_buffer, Fbuffer_local_variables,
Karl Heuer <kwzh@gnu.org>
parents: 9047
diff changeset
1436 (BOOLFWDP (tem) || INTFWDP (tem) || OBJFWDP (tem))))
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1437 /* Just reference the variable
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1438 to cause it to become set for this buffer. */
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1439 Fsymbol_value (XCONS (XCONS (tail)->car)->car);
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1440 }
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1441 }
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1442
10314
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1443 /* 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
1444 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
1445
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1446 void
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1447 set_buffer_temp (b)
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1448 struct buffer *b;
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1449 {
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1450 register struct buffer *old_buf;
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1451
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1452 if (current_buffer == b)
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1453 return;
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1454
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1455 old_buf = current_buffer;
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1456 current_buffer = b;
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1457
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1458 if (old_buf)
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1459 {
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1460 /* 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
1461 when it is not current, update them now. */
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1462 if (! NILP (old_buf->pt_marker))
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1463 {
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1464 Lisp_Object obuf;
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1465 XSETBUFFER (obuf, old_buf);
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1466 Fset_marker (old_buf->pt_marker, BUF_PT (old_buf), obuf);
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1467 }
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1468 if (! NILP (old_buf->begv_marker))
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1469 {
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1470 Lisp_Object obuf;
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1471 XSETBUFFER (obuf, old_buf);
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1472 Fset_marker (old_buf->begv_marker, BUF_BEGV (old_buf), obuf);
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1473 }
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1474 if (! NILP (old_buf->zv_marker))
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1475 {
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1476 Lisp_Object obuf;
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1477 XSETBUFFER (obuf, old_buf);
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1478 Fset_marker (old_buf->zv_marker, BUF_ZV (old_buf), obuf);
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1479 }
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1480 }
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1481
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1482 /* 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
1483 when it is not current, fetch them now. */
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1484 if (! NILP (b->pt_marker))
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1485 BUF_PT (b) = marker_position (b->pt_marker);
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1486 if (! NILP (b->begv_marker))
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1487 BUF_BEGV (b) = marker_position (b->begv_marker);
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1488 if (! NILP (b->zv_marker))
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1489 BUF_ZV (b) = marker_position (b->zv_marker);
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1490 }
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1491
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1492 DEFUN ("set-buffer", Fset_buffer, Sset_buffer, 1, 1, 0,
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1493 "Make the buffer BUFFER current for editing operations.\n\
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1494 BUFFER may be a buffer or the name of an existing buffer.\n\
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1495 See also `save-excursion' when you want to make a buffer current temporarily.\n\
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1496 This function does not display the buffer, so its effect ends\n\
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1497 when the current command terminates.\n\
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1498 Use `switch-to-buffer' or `pop-to-buffer' to switch buffers permanently.")
13762
71c14edf7d6d (Fkill_buffer): Rename arg bufname to buffer.
Karl Heuer <kwzh@gnu.org>
parents: 13446
diff changeset
1499 (buffer)
71c14edf7d6d (Fkill_buffer): Rename arg bufname to buffer.
Karl Heuer <kwzh@gnu.org>
parents: 13446
diff changeset
1500 register Lisp_Object buffer;
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1501 {
13762
71c14edf7d6d (Fkill_buffer): Rename arg bufname to buffer.
Karl Heuer <kwzh@gnu.org>
parents: 13446
diff changeset
1502 register Lisp_Object buf;
71c14edf7d6d (Fkill_buffer): Rename arg bufname to buffer.
Karl Heuer <kwzh@gnu.org>
parents: 13446
diff changeset
1503 buf = Fget_buffer (buffer);
71c14edf7d6d (Fkill_buffer): Rename arg bufname to buffer.
Karl Heuer <kwzh@gnu.org>
parents: 13446
diff changeset
1504 if (NILP (buf))
71c14edf7d6d (Fkill_buffer): Rename arg bufname to buffer.
Karl Heuer <kwzh@gnu.org>
parents: 13446
diff changeset
1505 nsberror (buffer);
71c14edf7d6d (Fkill_buffer): Rename arg bufname to buffer.
Karl Heuer <kwzh@gnu.org>
parents: 13446
diff changeset
1506 if (NILP (XBUFFER (buf)->name))
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1507 error ("Selecting deleted buffer");
13762
71c14edf7d6d (Fkill_buffer): Rename arg bufname to buffer.
Karl Heuer <kwzh@gnu.org>
parents: 13446
diff changeset
1508 set_buffer_internal (XBUFFER (buf));
71c14edf7d6d (Fkill_buffer): Rename arg bufname to buffer.
Karl Heuer <kwzh@gnu.org>
parents: 13446
diff changeset
1509 return buf;
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1510 }
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1511
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1512 DEFUN ("barf-if-buffer-read-only", Fbarf_if_buffer_read_only,
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1513 Sbarf_if_buffer_read_only, 0, 0, 0,
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1514 "Signal a `buffer-read-only' error if the current buffer is read-only.")
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1515 ()
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1516 {
3481
56424e6245c2 (syms_of_buffer): Set up Lisp var inhibit-read-only.
Richard M. Stallman <rms@gnu.org>
parents: 3463
diff changeset
1517 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
1518 && NILP (Vinhibit_read_only))
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1519 Fsignal (Qbuffer_read_only, (Fcons (Fcurrent_buffer (), Qnil)));
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1520 return Qnil;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1521 }
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1522
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1523 DEFUN ("bury-buffer", Fbury_buffer, Sbury_buffer, 0, 1, "",
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1524 "Put BUFFER at the end of the list of all buffers.\n\
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1525 There it is the least likely candidate for `other-buffer' to return;\n\
739
0bb85f26b79c *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 648
diff changeset
1526 thus, the least likely buffer for \\[switch-to-buffer] to select by default.\n\
1586
f84e400808d0 * buffer.c (Ferase_buffer): Doc fix.
Jim Blandy <jimb@redhat.com>
parents: 1563
diff changeset
1527 If BUFFER is nil or omitted, bury the current buffer.\n\
f84e400808d0 * buffer.c (Ferase_buffer): Doc fix.
Jim Blandy <jimb@redhat.com>
parents: 1563
diff changeset
1528 Also, if BUFFER is nil or omitted, remove the current buffer from the\n\
f84e400808d0 * buffer.c (Ferase_buffer): Doc fix.
Jim Blandy <jimb@redhat.com>
parents: 1563
diff changeset
1529 selected window if it is displayed there.")
14060
b62397f49a24 (Fmake_indirect_buffer, Fset_buffer_major_mode, Fpop_to_buffer,
Erik Naggum <erik@naggum.no>
parents: 13922
diff changeset
1530 (buffer)
b62397f49a24 (Fmake_indirect_buffer, Fset_buffer_major_mode, Fpop_to_buffer,
Erik Naggum <erik@naggum.no>
parents: 13922
diff changeset
1531 register Lisp_Object buffer;
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1532 {
1252
86a17674c2a1 * buffer.c (Fbury_buffer): This used to undisplay the buffer being
Jim Blandy <jimb@redhat.com>
parents: 1195
diff changeset
1533 /* 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
1534 if (NILP (buffer))
1586
f84e400808d0 * buffer.c (Ferase_buffer): Doc fix.
Jim Blandy <jimb@redhat.com>
parents: 1563
diff changeset
1535 {
14060
b62397f49a24 (Fmake_indirect_buffer, Fset_buffer_major_mode, Fpop_to_buffer,
Erik Naggum <erik@naggum.no>
parents: 13922
diff changeset
1536 XSETBUFFER (buffer, current_buffer);
1586
f84e400808d0 * buffer.c (Ferase_buffer): Doc fix.
Jim Blandy <jimb@redhat.com>
parents: 1563
diff changeset
1537 }
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1538 else
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1539 {
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1540 Lisp_Object buf1;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1541
14060
b62397f49a24 (Fmake_indirect_buffer, Fset_buffer_major_mode, Fpop_to_buffer,
Erik Naggum <erik@naggum.no>
parents: 13922
diff changeset
1542 buf1 = Fget_buffer (buffer);
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 392
diff changeset
1543 if (NILP (buf1))
14060
b62397f49a24 (Fmake_indirect_buffer, Fset_buffer_major_mode, Fpop_to_buffer,
Erik Naggum <erik@naggum.no>
parents: 13922
diff changeset
1544 nsberror (buffer);
b62397f49a24 (Fmake_indirect_buffer, Fset_buffer_major_mode, Fpop_to_buffer,
Erik Naggum <erik@naggum.no>
parents: 13922
diff changeset
1545 buffer = buf1;
1252
86a17674c2a1 * buffer.c (Fbury_buffer): This used to undisplay the buffer being
Jim Blandy <jimb@redhat.com>
parents: 1195
diff changeset
1546 }
86a17674c2a1 * buffer.c (Fbury_buffer): This used to undisplay the buffer being
Jim Blandy <jimb@redhat.com>
parents: 1195
diff changeset
1547
17735
f379e219ed8e (Fbury_buffer): If buffer is in selected window, remove it.
Richard M. Stallman <rms@gnu.org>
parents: 17566
diff changeset
1548 /* Unshow the buffer in the selected window, if it is there. */
f379e219ed8e (Fbury_buffer): If buffer is in selected window, remove it.
Richard M. Stallman <rms@gnu.org>
parents: 17566
diff changeset
1549 if (EQ (XWINDOW (selected_window)->buffer, buffer))
f379e219ed8e (Fbury_buffer): If buffer is in selected window, remove it.
Richard M. Stallman <rms@gnu.org>
parents: 17566
diff changeset
1550 Fswitch_to_buffer (Fother_buffer (buffer, Qnil), Qnil);
f379e219ed8e (Fbury_buffer): If buffer is in selected window, remove it.
Richard M. Stallman <rms@gnu.org>
parents: 17566
diff changeset
1551 /* Otherwise, unshow it in other frames. */
f379e219ed8e (Fbury_buffer): If buffer is in selected window, remove it.
Richard M. Stallman <rms@gnu.org>
parents: 17566
diff changeset
1552 else
f379e219ed8e (Fbury_buffer): If buffer is in selected window, remove it.
Richard M. Stallman <rms@gnu.org>
parents: 17566
diff changeset
1553 Freplace_buffer_in_windows (buffer);
f379e219ed8e (Fbury_buffer): If buffer is in selected window, remove it.
Richard M. Stallman <rms@gnu.org>
parents: 17566
diff changeset
1554
14060
b62397f49a24 (Fmake_indirect_buffer, Fset_buffer_major_mode, Fpop_to_buffer,
Erik Naggum <erik@naggum.no>
parents: 13922
diff changeset
1555 /* Move buffer to the end of the buffer list. */
1252
86a17674c2a1 * buffer.c (Fbury_buffer): This used to undisplay the buffer being
Jim Blandy <jimb@redhat.com>
parents: 1195
diff changeset
1556 {
86a17674c2a1 * buffer.c (Fbury_buffer): This used to undisplay the buffer being
Jim Blandy <jimb@redhat.com>
parents: 1195
diff changeset
1557 register Lisp_Object aelt, link;
86a17674c2a1 * buffer.c (Fbury_buffer): This used to undisplay the buffer being
Jim Blandy <jimb@redhat.com>
parents: 1195
diff changeset
1558
14060
b62397f49a24 (Fmake_indirect_buffer, Fset_buffer_major_mode, Fpop_to_buffer,
Erik Naggum <erik@naggum.no>
parents: 13922
diff changeset
1559 aelt = Frassq (buffer, Vbuffer_alist);
1252
86a17674c2a1 * buffer.c (Fbury_buffer): This used to undisplay the buffer being
Jim Blandy <jimb@redhat.com>
parents: 1195
diff changeset
1560 link = Fmemq (aelt, Vbuffer_alist);
86a17674c2a1 * buffer.c (Fbury_buffer): This used to undisplay the buffer being
Jim Blandy <jimb@redhat.com>
parents: 1195
diff changeset
1561 Vbuffer_alist = Fdelq (aelt, Vbuffer_alist);
86a17674c2a1 * buffer.c (Fbury_buffer): This used to undisplay the buffer being
Jim Blandy <jimb@redhat.com>
parents: 1195
diff changeset
1562 XCONS (link)->cdr = Qnil;
86a17674c2a1 * buffer.c (Fbury_buffer): This used to undisplay the buffer being
Jim Blandy <jimb@redhat.com>
parents: 1195
diff changeset
1563 Vbuffer_alist = nconc2 (Vbuffer_alist, link);
86a17674c2a1 * buffer.c (Fbury_buffer): This used to undisplay the buffer being
Jim Blandy <jimb@redhat.com>
parents: 1195
diff changeset
1564 }
86a17674c2a1 * buffer.c (Fbury_buffer): This used to undisplay the buffer being
Jim Blandy <jimb@redhat.com>
parents: 1195
diff changeset
1565
17238
ac05fe2b7114 (Fbury_buffer): add missing semi
Erik Naggum <erik@naggum.no>
parents: 17234
diff changeset
1566 frames_bury_buffer (buffer);
17234
bda734eef575 (Fbury_buffer): Call frames_bury_buffer.
Richard M. Stallman <rms@gnu.org>
parents: 17220
diff changeset
1567
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1568 return Qnil;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1569 }
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1570
1953
714df59790af (Ferase_buffer): Added interactive spec.
Roland McGrath <roland@gnu.org>
parents: 1952
diff changeset
1571 DEFUN ("erase-buffer", Ferase_buffer, Serase_buffer, 0, 0, "*",
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1572 "Delete the entire contents of the current buffer.\n\
4942
0ea29f510ba0 (Ferase_buffer): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 4852
diff changeset
1573 Any narrowing restriction in effect (see `narrow-to-region') is removed,\n\
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1574 so the buffer is truly empty after this.")
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1575 ()
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1576 {
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1577 Fwiden ();
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1578 del_range (BEG, Z);
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1579 current_buffer->last_window_start = 1;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1580 /* Prevent warnings, or suspension of auto saving, that would happen
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1581 if future size is less than past size. Use of erase-buffer
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1582 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
1583 XSETFASTINT (current_buffer->save_length, 0);
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1584 return Qnil;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1585 }
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1586
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1587 validate_region (b, e)
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1588 register Lisp_Object *b, *e;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1589 {
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1590 CHECK_NUMBER_COERCE_MARKER (*b, 0);
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1591 CHECK_NUMBER_COERCE_MARKER (*e, 1);
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1592
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1593 if (XINT (*b) > XINT (*e))
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1594 {
9335
8cf58b38d244 (validate_region): Swap using temp Lisp_Object, not int.
Karl Heuer <kwzh@gnu.org>
parents: 9296
diff changeset
1595 Lisp_Object tem;
8cf58b38d244 (validate_region): Swap using temp Lisp_Object, not int.
Karl Heuer <kwzh@gnu.org>
parents: 9296
diff changeset
1596 tem = *b; *b = *e; *e = tem;
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1597 }
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1598
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1599 if (!(BEGV <= XINT (*b) && XINT (*b) <= XINT (*e)
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1600 && XINT (*e) <= ZV))
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1601 args_out_of_range (*b, *e);
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1602 }
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1603
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1604 DEFUN ("kill-all-local-variables", Fkill_all_local_variables, Skill_all_local_variables,
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1605 0, 0, 0,
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1606 "Switch to Fundamental mode by killing current buffer's local variables.\n\
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1607 Most local variable bindings are eliminated so that the default values\n\
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1608 become effective once more. Also, the syntax table is set from\n\
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1609 `standard-syntax-table', the local keymap is set to nil,\n\
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1610 and the abbrev table from `fundamental-mode-abbrev-table'.\n\
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1611 This function also forces redisplay of the mode line.\n\
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1612 \n\
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1613 Every function to select a new major mode starts by\n\
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1614 calling this function.\n\n\
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1615 As a special exception, local variables whose names have\n\
7062
6356b8d3144e (Fkill_all_local_variables): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 7053
diff changeset
1616 a non-nil `permanent-local' property are not eliminated by this function.\n\
6356b8d3144e (Fkill_all_local_variables): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 7053
diff changeset
1617 \n\
6356b8d3144e (Fkill_all_local_variables): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 7053
diff changeset
1618 The first thing this function does is run\n\
6356b8d3144e (Fkill_all_local_variables): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 7053
diff changeset
1619 the normal hook `change-major-mode-hook'.")
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1620 ()
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1621 {
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1622 register Lisp_Object alist, sym, tem;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1623 Lisp_Object oalist;
5873
fa8b769ef564 (Fkill_all_local_variables): Run change-major-mode-hook.
Karl Heuer <kwzh@gnu.org>
parents: 5857
diff changeset
1624
6205
88e41d7d1e27 (Fkill_buffer, Fkill_all_local_variables):
Richard M. Stallman <rms@gnu.org>
parents: 6169
diff changeset
1625 if (!NILP (Vrun_hooks))
88e41d7d1e27 (Fkill_buffer, Fkill_all_local_variables):
Richard M. Stallman <rms@gnu.org>
parents: 6169
diff changeset
1626 call1 (Vrun_hooks, intern ("change-major-mode-hook"));
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1627 oalist = current_buffer->local_var_alist;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1628
11214
b880572ce431 (Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents: 11112
diff changeset
1629 /* 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
1630 remain swapped in, in their symbols. */
b880572ce431 (Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents: 11112
diff changeset
1631
b880572ce431 (Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents: 11112
diff changeset
1632 swap_out_buffer_local_variables (current_buffer);
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1633
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1634 /* Actually eliminate all local bindings of this buffer. */
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1635
15776
6018e01d4466 (buffer_permanent_local_flags): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 15638
diff changeset
1636 reset_buffer_local_variables (current_buffer, 0);
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1637
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1638 /* Redisplay mode lines; we are changing major mode. */
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1639
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1640 update_mode_lines++;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1641
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1642 /* Any which are supposed to be permanent,
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1643 make local again, with the same values they had. */
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1644
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 392
diff changeset
1645 for (alist = oalist; !NILP (alist); alist = XCONS (alist)->cdr)
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1646 {
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1647 sym = XCONS (XCONS (alist)->car)->car;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1648 tem = Fget (sym, Qpermanent_local);
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 392
diff changeset
1649 if (! NILP (tem))
392
dce611246f59 *** empty log message ***
Roland McGrath <roland@gnu.org>
parents: 333
diff changeset
1650 {
dce611246f59 *** empty log message ***
Roland McGrath <roland@gnu.org>
parents: 333
diff changeset
1651 Fmake_local_variable (sym);
dce611246f59 *** empty log message ***
Roland McGrath <roland@gnu.org>
parents: 333
diff changeset
1652 Fset (sym, XCONS (XCONS (alist)->car)->cdr);
dce611246f59 *** empty log message ***
Roland McGrath <roland@gnu.org>
parents: 333
diff changeset
1653 }
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1654 }
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1655
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1656 /* Force mode-line redisplay. Useful here because all major mode
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1657 commands call this function. */
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1658 update_mode_lines++;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1659
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1660 return Qnil;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1661 }
11214
b880572ce431 (Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents: 11112
diff changeset
1662
b880572ce431 (Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents: 11112
diff changeset
1663 /* 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
1664 for their current values. */
b880572ce431 (Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents: 11112
diff changeset
1665
b880572ce431 (Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents: 11112
diff changeset
1666 static void
b880572ce431 (Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents: 11112
diff changeset
1667 swap_out_buffer_local_variables (b)
b880572ce431 (Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents: 11112
diff changeset
1668 struct buffer *b;
b880572ce431 (Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents: 11112
diff changeset
1669 {
b880572ce431 (Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents: 11112
diff changeset
1670 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
1671
b880572ce431 (Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents: 11112
diff changeset
1672 XSETBUFFER (buffer, b);
b880572ce431 (Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents: 11112
diff changeset
1673 oalist = b->local_var_alist;
b880572ce431 (Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents: 11112
diff changeset
1674
b880572ce431 (Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents: 11112
diff changeset
1675 for (alist = oalist; !NILP (alist); alist = XCONS (alist)->cdr)
b880572ce431 (Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents: 11112
diff changeset
1676 {
b880572ce431 (Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents: 11112
diff changeset
1677 sym = XCONS (XCONS (alist)->car)->car;
b880572ce431 (Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents: 11112
diff changeset
1678
b880572ce431 (Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents: 11112
diff changeset
1679 /* Need not do anything if some other buffer's binding is now encached. */
b880572ce431 (Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents: 11112
diff changeset
1680 tem = XCONS (XBUFFER_LOCAL_VALUE (XSYMBOL (sym)->value)->cdr)->car;
b880572ce431 (Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents: 11112
diff changeset
1681 if (XBUFFER (tem) == current_buffer)
b880572ce431 (Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents: 11112
diff changeset
1682 {
b880572ce431 (Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents: 11112
diff changeset
1683 /* 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
1684 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
1685
b880572ce431 (Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents: 11112
diff changeset
1686 tem = XCONS (XBUFFER_LOCAL_VALUE (XSYMBOL (sym)->value)->cdr)->cdr;
b880572ce431 (Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents: 11112
diff changeset
1687 /* 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
1688 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
1689 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
1690 later in Fkill_all_local_variables, we don't lose the value. */
b880572ce431 (Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents: 11112
diff changeset
1691 XCONS (XCONS (tem)->car)->cdr
b880572ce431 (Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents: 11112
diff changeset
1692 = do_symval_forwarding (XBUFFER_LOCAL_VALUE (XSYMBOL (sym)->value)->car);
b880572ce431 (Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents: 11112
diff changeset
1693 /* Switch to the symbol's default-value alist entry. */
b880572ce431 (Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents: 11112
diff changeset
1694 XCONS (tem)->car = tem;
b880572ce431 (Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents: 11112
diff changeset
1695 /* Mark it as current for buffer B. */
b880572ce431 (Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents: 11112
diff changeset
1696 XCONS (XBUFFER_LOCAL_VALUE (XSYMBOL (sym)->value)->cdr)->car
b880572ce431 (Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents: 11112
diff changeset
1697 = buffer;
b880572ce431 (Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents: 11112
diff changeset
1698 /* Store the current value into any forwarding in the symbol. */
b880572ce431 (Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents: 11112
diff changeset
1699 store_symval_forwarding (sym, XBUFFER_LOCAL_VALUE (XSYMBOL (sym)->value)->car,
b880572ce431 (Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents: 11112
diff changeset
1700 XCONS (tem)->cdr);
b880572ce431 (Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents: 11112
diff changeset
1701 }
b880572ce431 (Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents: 11112
diff changeset
1702 }
b880572ce431 (Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents: 11112
diff changeset
1703 }
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1704
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
1705 /* Find all the overlays in the current buffer that contain position POS.
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
1706 Return the number found, and store them in a vector in *VEC_PTR.
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
1707 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
1708 Store in *NEXT_PTR the next position after POS where an overlay starts,
8bf3bb4c20dd * lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents: 2722
diff changeset
1709 or ZV if there are no more overlays.
11693
efef31f1c42d (Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents: 11659
diff changeset
1710 Store in *PREV_PTR the previous position before POS where an overlay ends,
8967
80b92977ed08 (overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents: 8924
diff changeset
1711 or BEGV if there are no previous overlays.
80b92977ed08 (overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents: 8924
diff changeset
1712 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
1713
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
1714 *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
1715 when this function is called.
8c43cc245dd2 (overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents: 2791
diff changeset
1716
8c43cc245dd2 (overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents: 2791
diff changeset
1717 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
1718 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
1719 and we store only as many overlays as will fit.
8c43cc245dd2 (overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents: 2791
diff changeset
1720 But we still return the total number of overlays. */
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
1721
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
1722 int
8967
80b92977ed08 (overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents: 8924
diff changeset
1723 overlays_at (pos, extend, vec_ptr, len_ptr, next_ptr, prev_ptr)
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
1724 int pos;
2839
8c43cc245dd2 (overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents: 2791
diff changeset
1725 int extend;
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
1726 Lisp_Object **vec_ptr;
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
1727 int *len_ptr;
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
1728 int *next_ptr;
8967
80b92977ed08 (overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents: 8924
diff changeset
1729 int *prev_ptr;
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1730 {
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
1731 Lisp_Object tail, overlay, start, end, result;
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
1732 int idx = 0;
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
1733 int len = *len_ptr;
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
1734 Lisp_Object *vec = *vec_ptr;
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
1735 int next = ZV;
8967
80b92977ed08 (overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents: 8924
diff changeset
1736 int prev = BEGV;
2839
8c43cc245dd2 (overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents: 2791
diff changeset
1737 int inhibit_storing = 0;
8c43cc245dd2 (overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents: 2791
diff changeset
1738
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
1739 for (tail = current_buffer->overlays_before;
9950
605bd2a8f816 (overlays_at): Use the new type-test macros.
Karl Heuer <kwzh@gnu.org>
parents: 9939
diff changeset
1740 GC_CONSP (tail);
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
1741 tail = XCONS (tail)->cdr)
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
1742 {
8967
80b92977ed08 (overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents: 8924
diff changeset
1743 int startpos, endpos;
2776
8bf3bb4c20dd * lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents: 2722
diff changeset
1744
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
1745 overlay = XCONS (tail)->car;
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
1746
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
1747 start = OVERLAY_START (overlay);
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
1748 end = OVERLAY_END (overlay);
8967
80b92977ed08 (overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents: 8924
diff changeset
1749 endpos = OVERLAY_POSITION (end);
80b92977ed08 (overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents: 8924
diff changeset
1750 if (endpos < pos)
80b92977ed08 (overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents: 8924
diff changeset
1751 {
80b92977ed08 (overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents: 8924
diff changeset
1752 if (prev < endpos)
80b92977ed08 (overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents: 8924
diff changeset
1753 prev = endpos;
80b92977ed08 (overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents: 8924
diff changeset
1754 break;
80b92977ed08 (overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents: 8924
diff changeset
1755 }
80b92977ed08 (overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents: 8924
diff changeset
1756 if (endpos == pos)
80b92977ed08 (overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents: 8924
diff changeset
1757 continue;
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
1758 startpos = OVERLAY_POSITION (start);
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
1759 if (startpos <= pos)
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
1760 {
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
1761 if (idx == len)
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
1762 {
2839
8c43cc245dd2 (overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents: 2791
diff changeset
1763 /* The supplied vector is full.
8c43cc245dd2 (overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents: 2791
diff changeset
1764 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
1765 if (extend)
8c43cc245dd2 (overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents: 2791
diff changeset
1766 {
8c43cc245dd2 (overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents: 2791
diff changeset
1767 *len_ptr = len *= 2;
8c43cc245dd2 (overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents: 2791
diff changeset
1768 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
1769 *vec_ptr = vec;
8c43cc245dd2 (overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents: 2791
diff changeset
1770 }
8c43cc245dd2 (overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents: 2791
diff changeset
1771 else
8c43cc245dd2 (overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents: 2791
diff changeset
1772 inhibit_storing = 1;
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
1773 }
2839
8c43cc245dd2 (overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents: 2791
diff changeset
1774
8c43cc245dd2 (overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents: 2791
diff changeset
1775 if (!inhibit_storing)
8c43cc245dd2 (overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents: 2791
diff changeset
1776 vec[idx] = overlay;
8c43cc245dd2 (overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents: 2791
diff changeset
1777 /* 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
1778 idx++;
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
1779 }
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
1780 else if (startpos < next)
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
1781 next = startpos;
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
1782 }
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
1783
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
1784 for (tail = current_buffer->overlays_after;
9950
605bd2a8f816 (overlays_at): Use the new type-test macros.
Karl Heuer <kwzh@gnu.org>
parents: 9939
diff changeset
1785 GC_CONSP (tail);
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
1786 tail = XCONS (tail)->cdr)
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
1787 {
8967
80b92977ed08 (overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents: 8924
diff changeset
1788 int startpos, endpos;
2776
8bf3bb4c20dd * lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents: 2722
diff changeset
1789
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
1790 overlay = XCONS (tail)->car;
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
1791
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
1792 start = OVERLAY_START (overlay);
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
1793 end = OVERLAY_END (overlay);
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
1794 startpos = OVERLAY_POSITION (start);
2776
8bf3bb4c20dd * lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents: 2722
diff changeset
1795 if (pos < startpos)
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
1796 {
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
1797 if (startpos < next)
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
1798 next = startpos;
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
1799 break;
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
1800 }
8967
80b92977ed08 (overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents: 8924
diff changeset
1801 endpos = OVERLAY_POSITION (end);
80b92977ed08 (overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents: 8924
diff changeset
1802 if (pos < endpos)
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
1803 {
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
1804 if (idx == len)
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
1805 {
2839
8c43cc245dd2 (overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents: 2791
diff changeset
1806 if (extend)
8c43cc245dd2 (overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents: 2791
diff changeset
1807 {
8c43cc245dd2 (overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents: 2791
diff changeset
1808 *len_ptr = len *= 2;
8c43cc245dd2 (overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents: 2791
diff changeset
1809 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
1810 *vec_ptr = vec;
8c43cc245dd2 (overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents: 2791
diff changeset
1811 }
8c43cc245dd2 (overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents: 2791
diff changeset
1812 else
8c43cc245dd2 (overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents: 2791
diff changeset
1813 inhibit_storing = 1;
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
1814 }
2839
8c43cc245dd2 (overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents: 2791
diff changeset
1815
8c43cc245dd2 (overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents: 2791
diff changeset
1816 if (!inhibit_storing)
8c43cc245dd2 (overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents: 2791
diff changeset
1817 vec[idx] = overlay;
8c43cc245dd2 (overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents: 2791
diff changeset
1818 idx++;
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
1819 }
8967
80b92977ed08 (overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents: 8924
diff changeset
1820 else if (endpos < pos && endpos > prev)
80b92977ed08 (overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents: 8924
diff changeset
1821 prev = endpos;
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
1822 }
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
1823
8967
80b92977ed08 (overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents: 8924
diff changeset
1824 if (next_ptr)
80b92977ed08 (overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents: 8924
diff changeset
1825 *next_ptr = next;
80b92977ed08 (overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents: 8924
diff changeset
1826 if (prev_ptr)
80b92977ed08 (overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents: 8924
diff changeset
1827 *prev_ptr = prev;
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
1828 return idx;
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
1829 }
12382
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
1830
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
1831 /* 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
1832 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
1833
12382
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
1834 Return the number found, and store them in a vector in *VEC_PTR.
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
1835 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
1836 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
1837 or ZV if there are no more overlays.
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
1838 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
1839 or BEGV if there are no previous overlays.
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
1840 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
1841
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
1842 *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
1843 when this function is called.
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
1844
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
1845 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
1846 If EXTEND is zero, we never extend the vector,
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
1847 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
1848 But we still return the total number of overlays. */
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
1849
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
1850 int
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
1851 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
1852 int beg, end;
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
1853 int extend;
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
1854 Lisp_Object **vec_ptr;
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
1855 int *len_ptr;
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
1856 int *next_ptr;
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
1857 int *prev_ptr;
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
1858 {
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
1859 Lisp_Object tail, overlay, ostart, oend, result;
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
1860 int idx = 0;
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
1861 int len = *len_ptr;
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
1862 Lisp_Object *vec = *vec_ptr;
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
1863 int next = ZV;
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
1864 int prev = BEGV;
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
1865 int inhibit_storing = 0;
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
1866
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
1867 for (tail = current_buffer->overlays_before;
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
1868 GC_CONSP (tail);
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
1869 tail = XCONS (tail)->cdr)
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
1870 {
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
1871 int startpos, endpos;
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
1872
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
1873 overlay = XCONS (tail)->car;
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
1874
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
1875 ostart = OVERLAY_START (overlay);
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
1876 oend = OVERLAY_END (overlay);
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
1877 endpos = OVERLAY_POSITION (oend);
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
1878 if (endpos < beg)
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
1879 {
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
1880 if (prev < endpos)
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
1881 prev = endpos;
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
1882 break;
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
1883 }
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
1884 startpos = OVERLAY_POSITION (ostart);
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
1885 /* 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
1886 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
1887 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
1888 || (startpos == endpos && beg == endpos))
12382
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
1889 {
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
1890 if (idx == len)
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
1891 {
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
1892 /* The supplied vector is full.
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
1893 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
1894 if (extend)
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
1895 {
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
1896 *len_ptr = len *= 2;
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
1897 vec = (Lisp_Object *) xrealloc (vec, len * sizeof (Lisp_Object));
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
1898 *vec_ptr = vec;
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
1899 }
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
1900 else
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
1901 inhibit_storing = 1;
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
1902 }
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
1903
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
1904 if (!inhibit_storing)
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
1905 vec[idx] = overlay;
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
1906 /* 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
1907 idx++;
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
1908 }
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
1909 else if (startpos < next)
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
1910 next = startpos;
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
1911 }
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
1912
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
1913 for (tail = current_buffer->overlays_after;
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
1914 GC_CONSP (tail);
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
1915 tail = XCONS (tail)->cdr)
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
1916 {
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
1917 int startpos, endpos;
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
1918
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
1919 overlay = XCONS (tail)->car;
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
1920
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
1921 ostart = OVERLAY_START (overlay);
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
1922 oend = OVERLAY_END (overlay);
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
1923 startpos = OVERLAY_POSITION (ostart);
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
1924 if (end < startpos)
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
1925 {
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
1926 if (startpos < next)
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
1927 next = startpos;
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
1928 break;
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
1929 }
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
1930 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
1931 /* 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
1932 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
1933 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
1934 || (startpos == endpos && beg == endpos))
12382
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
1935 {
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
1936 if (idx == len)
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
1937 {
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
1938 if (extend)
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
1939 {
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
1940 *len_ptr = len *= 2;
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
1941 vec = (Lisp_Object *) xrealloc (vec, len * sizeof (Lisp_Object));
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
1942 *vec_ptr = vec;
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
1943 }
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
1944 else
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
1945 inhibit_storing = 1;
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
1946 }
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
1947
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
1948 if (!inhibit_storing)
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
1949 vec[idx] = overlay;
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
1950 idx++;
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
1951 }
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
1952 else if (endpos < beg && endpos > prev)
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
1953 prev = endpos;
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
1954 }
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
1955
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
1956 if (next_ptr)
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
1957 *next_ptr = next;
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
1958 if (prev_ptr)
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
1959 *prev_ptr = prev;
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
1960 return idx;
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
1961 }
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
1962
11097
e1b4b0d66bf3 (overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents: 11052
diff changeset
1963 /* 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
1964 int
e1b4b0d66bf3 (overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents: 11052
diff changeset
1965 overlay_touches_p (pos)
e1b4b0d66bf3 (overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents: 11052
diff changeset
1966 int pos;
e1b4b0d66bf3 (overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents: 11052
diff changeset
1967 {
e1b4b0d66bf3 (overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents: 11052
diff changeset
1968 Lisp_Object tail, overlay;
e1b4b0d66bf3 (overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents: 11052
diff changeset
1969
e1b4b0d66bf3 (overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents: 11052
diff changeset
1970 for (tail = current_buffer->overlays_before; GC_CONSP (tail);
e1b4b0d66bf3 (overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents: 11052
diff changeset
1971 tail = XCONS (tail)->cdr)
e1b4b0d66bf3 (overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents: 11052
diff changeset
1972 {
e1b4b0d66bf3 (overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents: 11052
diff changeset
1973 int endpos;
e1b4b0d66bf3 (overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents: 11052
diff changeset
1974
e1b4b0d66bf3 (overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents: 11052
diff changeset
1975 overlay = XCONS (tail)->car;
e1b4b0d66bf3 (overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents: 11052
diff changeset
1976 if (!GC_OVERLAYP (overlay))
e1b4b0d66bf3 (overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents: 11052
diff changeset
1977 abort ();
e1b4b0d66bf3 (overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents: 11052
diff changeset
1978
e1b4b0d66bf3 (overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents: 11052
diff changeset
1979 endpos = OVERLAY_POSITION (OVERLAY_END (overlay));
e1b4b0d66bf3 (overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents: 11052
diff changeset
1980 if (endpos < pos)
e1b4b0d66bf3 (overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents: 11052
diff changeset
1981 break;
e1b4b0d66bf3 (overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents: 11052
diff changeset
1982 if (endpos == pos || OVERLAY_POSITION (OVERLAY_START (overlay)) == pos)
e1b4b0d66bf3 (overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents: 11052
diff changeset
1983 return 1;
e1b4b0d66bf3 (overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents: 11052
diff changeset
1984 }
e1b4b0d66bf3 (overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents: 11052
diff changeset
1985
e1b4b0d66bf3 (overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents: 11052
diff changeset
1986 for (tail = current_buffer->overlays_after; GC_CONSP (tail);
e1b4b0d66bf3 (overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents: 11052
diff changeset
1987 tail = XCONS (tail)->cdr)
e1b4b0d66bf3 (overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents: 11052
diff changeset
1988 {
e1b4b0d66bf3 (overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents: 11052
diff changeset
1989 int startpos;
e1b4b0d66bf3 (overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents: 11052
diff changeset
1990
e1b4b0d66bf3 (overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents: 11052
diff changeset
1991 overlay = XCONS (tail)->car;
e1b4b0d66bf3 (overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents: 11052
diff changeset
1992 if (!GC_OVERLAYP (overlay))
e1b4b0d66bf3 (overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents: 11052
diff changeset
1993 abort ();
e1b4b0d66bf3 (overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents: 11052
diff changeset
1994
e1b4b0d66bf3 (overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents: 11052
diff changeset
1995 startpos = OVERLAY_POSITION (OVERLAY_START (overlay));
e1b4b0d66bf3 (overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents: 11052
diff changeset
1996 if (pos < startpos)
e1b4b0d66bf3 (overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents: 11052
diff changeset
1997 break;
e1b4b0d66bf3 (overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents: 11052
diff changeset
1998 if (startpos == pos || OVERLAY_POSITION (OVERLAY_END (overlay)) == pos)
e1b4b0d66bf3 (overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents: 11052
diff changeset
1999 return 1;
e1b4b0d66bf3 (overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents: 11052
diff changeset
2000 }
e1b4b0d66bf3 (overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents: 11052
diff changeset
2001 return 0;
e1b4b0d66bf3 (overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents: 11052
diff changeset
2002 }
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
2003
5857
03f8720af7fb (sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents: 5703
diff changeset
2004 struct sortvec
03f8720af7fb (sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents: 5703
diff changeset
2005 {
03f8720af7fb (sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents: 5703
diff changeset
2006 Lisp_Object overlay;
03f8720af7fb (sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents: 5703
diff changeset
2007 int beg, end;
03f8720af7fb (sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents: 5703
diff changeset
2008 int priority;
03f8720af7fb (sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents: 5703
diff changeset
2009 };
03f8720af7fb (sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents: 5703
diff changeset
2010
03f8720af7fb (sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents: 5703
diff changeset
2011 static int
03f8720af7fb (sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents: 5703
diff changeset
2012 compare_overlays (s1, s2)
03f8720af7fb (sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents: 5703
diff changeset
2013 struct sortvec *s1, *s2;
03f8720af7fb (sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents: 5703
diff changeset
2014 {
03f8720af7fb (sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents: 5703
diff changeset
2015 if (s1->priority != s2->priority)
03f8720af7fb (sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents: 5703
diff changeset
2016 return s1->priority - s2->priority;
03f8720af7fb (sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents: 5703
diff changeset
2017 if (s1->beg != s2->beg)
03f8720af7fb (sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents: 5703
diff changeset
2018 return s1->beg - s2->beg;
03f8720af7fb (sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents: 5703
diff changeset
2019 if (s1->end != s2->end)
03f8720af7fb (sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents: 5703
diff changeset
2020 return s2->end - s1->end;
03f8720af7fb (sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents: 5703
diff changeset
2021 return 0;
03f8720af7fb (sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents: 5703
diff changeset
2022 }
03f8720af7fb (sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents: 5703
diff changeset
2023
03f8720af7fb (sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents: 5703
diff changeset
2024 /* 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
2025 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
2026 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
2027 int
03f8720af7fb (sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents: 5703
diff changeset
2028 sort_overlays (overlay_vec, noverlays, w)
03f8720af7fb (sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents: 5703
diff changeset
2029 Lisp_Object *overlay_vec;
03f8720af7fb (sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents: 5703
diff changeset
2030 int noverlays;
03f8720af7fb (sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents: 5703
diff changeset
2031 struct window *w;
03f8720af7fb (sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents: 5703
diff changeset
2032 {
03f8720af7fb (sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents: 5703
diff changeset
2033 int i, j;
03f8720af7fb (sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents: 5703
diff changeset
2034 struct sortvec *sortvec;
03f8720af7fb (sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents: 5703
diff changeset
2035 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
2036
03f8720af7fb (sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents: 5703
diff changeset
2037 /* 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
2038
03f8720af7fb (sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents: 5703
diff changeset
2039 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
2040 {
6061
e40292d5c167 (sort_overlays): Allow for null window.
Karl Heuer <kwzh@gnu.org>
parents: 6051
diff changeset
2041 Lisp_Object tem;
6493
33a461f14903 (sort_overlays, Fmake_overlay): Use assignment, not initialization.
Karl Heuer <kwzh@gnu.org>
parents: 6477
diff changeset
2042 Lisp_Object overlay;
33a461f14903 (sort_overlays, Fmake_overlay): Use assignment, not initialization.
Karl Heuer <kwzh@gnu.org>
parents: 6477
diff changeset
2043
33a461f14903 (sort_overlays, Fmake_overlay): Use assignment, not initialization.
Karl Heuer <kwzh@gnu.org>
parents: 6477
diff changeset
2044 overlay = overlay_vec[i];
5857
03f8720af7fb (sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents: 5703
diff changeset
2045 if (OVERLAY_VALID (overlay)
03f8720af7fb (sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents: 5703
diff changeset
2046 && OVERLAY_POSITION (OVERLAY_START (overlay)) > 0
03f8720af7fb (sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents: 5703
diff changeset
2047 && OVERLAY_POSITION (OVERLAY_END (overlay)) > 0)
03f8720af7fb (sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents: 5703
diff changeset
2048 {
6061
e40292d5c167 (sort_overlays): Allow for null window.
Karl Heuer <kwzh@gnu.org>
parents: 6051
diff changeset
2049 /* 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
2050 overlays that are limited to some other window. */
e40292d5c167 (sort_overlays): Allow for null window.
Karl Heuer <kwzh@gnu.org>
parents: 6051
diff changeset
2051 if (w)
5857
03f8720af7fb (sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents: 5703
diff changeset
2052 {
6061
e40292d5c167 (sort_overlays): Allow for null window.
Karl Heuer <kwzh@gnu.org>
parents: 6051
diff changeset
2053 Lisp_Object window;
e40292d5c167 (sort_overlays): Allow for null window.
Karl Heuer <kwzh@gnu.org>
parents: 6051
diff changeset
2054
e40292d5c167 (sort_overlays): Allow for null window.
Karl Heuer <kwzh@gnu.org>
parents: 6051
diff changeset
2055 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
2056 if (WINDOWP (window) && XWINDOW (window) != w)
6061
e40292d5c167 (sort_overlays): Allow for null window.
Karl Heuer <kwzh@gnu.org>
parents: 6051
diff changeset
2057 continue;
5857
03f8720af7fb (sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents: 5703
diff changeset
2058 }
6061
e40292d5c167 (sort_overlays): Allow for null window.
Karl Heuer <kwzh@gnu.org>
parents: 6051
diff changeset
2059
e40292d5c167 (sort_overlays): Allow for null window.
Karl Heuer <kwzh@gnu.org>
parents: 6051
diff changeset
2060 /* 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
2061 sortvec[j].overlay = overlay;
e40292d5c167 (sort_overlays): Allow for null window.
Karl Heuer <kwzh@gnu.org>
parents: 6051
diff changeset
2062 sortvec[j].beg = OVERLAY_POSITION (OVERLAY_START (overlay));
e40292d5c167 (sort_overlays): Allow for null window.
Karl Heuer <kwzh@gnu.org>
parents: 6051
diff changeset
2063 sortvec[j].end = OVERLAY_POSITION (OVERLAY_END (overlay));
e40292d5c167 (sort_overlays): Allow for null window.
Karl Heuer <kwzh@gnu.org>
parents: 6051
diff changeset
2064 tem = Foverlay_get (overlay, Qpriority);
e40292d5c167 (sort_overlays): Allow for null window.
Karl Heuer <kwzh@gnu.org>
parents: 6051
diff changeset
2065 if (INTEGERP (tem))
e40292d5c167 (sort_overlays): Allow for null window.
Karl Heuer <kwzh@gnu.org>
parents: 6051
diff changeset
2066 sortvec[j].priority = XINT (tem);
e40292d5c167 (sort_overlays): Allow for null window.
Karl Heuer <kwzh@gnu.org>
parents: 6051
diff changeset
2067 else
e40292d5c167 (sort_overlays): Allow for null window.
Karl Heuer <kwzh@gnu.org>
parents: 6051
diff changeset
2068 sortvec[j].priority = 0;
e40292d5c167 (sort_overlays): Allow for null window.
Karl Heuer <kwzh@gnu.org>
parents: 6051
diff changeset
2069 j++;
5857
03f8720af7fb (sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents: 5703
diff changeset
2070 }
03f8720af7fb (sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents: 5703
diff changeset
2071 }
03f8720af7fb (sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents: 5703
diff changeset
2072 noverlays = j;
03f8720af7fb (sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents: 5703
diff changeset
2073
03f8720af7fb (sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents: 5703
diff changeset
2074 /* 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
2075
03f8720af7fb (sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents: 5703
diff changeset
2076 if (noverlays > 1)
03f8720af7fb (sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents: 5703
diff changeset
2077 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
2078
03f8720af7fb (sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents: 5703
diff changeset
2079 for (i = 0; i < noverlays; i++)
03f8720af7fb (sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents: 5703
diff changeset
2080 overlay_vec[i] = sortvec[i].overlay;
03f8720af7fb (sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents: 5703
diff changeset
2081 return (noverlays);
03f8720af7fb (sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents: 5703
diff changeset
2082 }
03f8720af7fb (sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents: 5703
diff changeset
2083
11693
efef31f1c42d (Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents: 11659
diff changeset
2084 struct sortstr
efef31f1c42d (Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents: 11659
diff changeset
2085 {
12699
d0f4113de2ea (record_overlay_string, overlay_strings): Handle zero-sized overlays better.
Karl Heuer <kwzh@gnu.org>
parents: 12697
diff changeset
2086 Lisp_Object string, string2;
11693
efef31f1c42d (Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents: 11659
diff changeset
2087 int size;
efef31f1c42d (Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents: 11659
diff changeset
2088 int priority;
efef31f1c42d (Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents: 11659
diff changeset
2089 };
efef31f1c42d (Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents: 11659
diff changeset
2090
12697
9ebf33d6d07c (struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents: 12538
diff changeset
2091 struct sortstrlist
9ebf33d6d07c (struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents: 12538
diff changeset
2092 {
9ebf33d6d07c (struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents: 12538
diff changeset
2093 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
2094 int size; /* Allocated length of that array. */
9ebf33d6d07c (struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents: 12538
diff changeset
2095 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
2096 int bytes; /* Total length of the strings in buf. */
9ebf33d6d07c (struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents: 12538
diff changeset
2097 };
9ebf33d6d07c (struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents: 12538
diff changeset
2098
9ebf33d6d07c (struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents: 12538
diff changeset
2099 /* Buffers for storing information about the overlays touching a given
9ebf33d6d07c (struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents: 12538
diff changeset
2100 position. These could be automatic variables in overlay_strings, but
9ebf33d6d07c (struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents: 12538
diff changeset
2101 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
2102 allocating and freeing it. */
9ebf33d6d07c (struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents: 12538
diff changeset
2103 static struct sortstrlist overlay_heads, overlay_tails;
9ebf33d6d07c (struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents: 12538
diff changeset
2104 static char *overlay_str_buf;
9ebf33d6d07c (struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents: 12538
diff changeset
2105
9ebf33d6d07c (struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents: 12538
diff changeset
2106 /* Allocated length of overlay_str_buf. */
9ebf33d6d07c (struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents: 12538
diff changeset
2107 static int overlay_str_len;
9ebf33d6d07c (struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents: 12538
diff changeset
2108
11693
efef31f1c42d (Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents: 11659
diff changeset
2109 /* A comparison function suitable for passing to qsort. */
efef31f1c42d (Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents: 11659
diff changeset
2110 static int
efef31f1c42d (Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents: 11659
diff changeset
2111 cmp_for_strings (as1, as2)
efef31f1c42d (Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents: 11659
diff changeset
2112 char *as1, *as2;
efef31f1c42d (Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents: 11659
diff changeset
2113 {
efef31f1c42d (Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents: 11659
diff changeset
2114 struct sortstr *s1 = (struct sortstr *)as1;
efef31f1c42d (Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents: 11659
diff changeset
2115 struct sortstr *s2 = (struct sortstr *)as2;
efef31f1c42d (Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents: 11659
diff changeset
2116 if (s1->size != s2->size)
efef31f1c42d (Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents: 11659
diff changeset
2117 return s2->size - s1->size;
efef31f1c42d (Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents: 11659
diff changeset
2118 if (s1->priority != s2->priority)
efef31f1c42d (Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents: 11659
diff changeset
2119 return s1->priority - s2->priority;
efef31f1c42d (Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents: 11659
diff changeset
2120 return 0;
efef31f1c42d (Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents: 11659
diff changeset
2121 }
efef31f1c42d (Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents: 11659
diff changeset
2122
12697
9ebf33d6d07c (struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents: 12538
diff changeset
2123 static void
12699
d0f4113de2ea (record_overlay_string, overlay_strings): Handle zero-sized overlays better.
Karl Heuer <kwzh@gnu.org>
parents: 12697
diff changeset
2124 record_overlay_string (ssl, str, str2, pri, size)
12697
9ebf33d6d07c (struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents: 12538
diff changeset
2125 struct sortstrlist *ssl;
12699
d0f4113de2ea (record_overlay_string, overlay_strings): Handle zero-sized overlays better.
Karl Heuer <kwzh@gnu.org>
parents: 12697
diff changeset
2126 Lisp_Object str, str2, pri;
12697
9ebf33d6d07c (struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents: 12538
diff changeset
2127 int size;
9ebf33d6d07c (struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents: 12538
diff changeset
2128 {
9ebf33d6d07c (struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents: 12538
diff changeset
2129 if (ssl->used == ssl->size)
9ebf33d6d07c (struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents: 12538
diff changeset
2130 {
9ebf33d6d07c (struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents: 12538
diff changeset
2131 if (ssl->buf)
9ebf33d6d07c (struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents: 12538
diff changeset
2132 ssl->size *= 2;
9ebf33d6d07c (struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents: 12538
diff changeset
2133 else
9ebf33d6d07c (struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents: 12538
diff changeset
2134 ssl->size = 5;
9ebf33d6d07c (struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents: 12538
diff changeset
2135 ssl->buf = ((struct sortstr *)
9ebf33d6d07c (struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents: 12538
diff changeset
2136 xrealloc (ssl->buf, ssl->size * sizeof (struct sortstr)));
9ebf33d6d07c (struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents: 12538
diff changeset
2137 }
9ebf33d6d07c (struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents: 12538
diff changeset
2138 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
2139 ssl->buf[ssl->used].string2 = str2;
12697
9ebf33d6d07c (struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents: 12538
diff changeset
2140 ssl->buf[ssl->used].size = size;
9ebf33d6d07c (struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents: 12538
diff changeset
2141 ssl->buf[ssl->used].priority = (INTEGERP (pri) ? XINT (pri) : 0);
9ebf33d6d07c (struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents: 12538
diff changeset
2142 ssl->used++;
9ebf33d6d07c (struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents: 12538
diff changeset
2143 ssl->bytes += XSTRING (str)->size;
12699
d0f4113de2ea (record_overlay_string, overlay_strings): Handle zero-sized overlays better.
Karl Heuer <kwzh@gnu.org>
parents: 12697
diff changeset
2144 if (STRINGP (str2))
d0f4113de2ea (record_overlay_string, overlay_strings): Handle zero-sized overlays better.
Karl Heuer <kwzh@gnu.org>
parents: 12697
diff changeset
2145 ssl->bytes += XSTRING (str2)->size;
12697
9ebf33d6d07c (struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents: 12538
diff changeset
2146 }
11693
efef31f1c42d (Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents: 11659
diff changeset
2147
efef31f1c42d (Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents: 11659
diff changeset
2148 /* 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
2149 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
2150 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
2151 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
2152 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
2153 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
2154 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
2155
d0f4113de2ea (record_overlay_string, overlay_strings): Handle zero-sized overlays better.
Karl Heuer <kwzh@gnu.org>
parents: 12697
diff changeset
2156 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
2157 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
2158 subsequent calls. */
16243
b311d8755530 (overlay_strings): Declare pstr using unsigned char.
Richard M. Stallman <rms@gnu.org>
parents: 16213
diff changeset
2159
11693
efef31f1c42d (Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents: 11659
diff changeset
2160 int
efef31f1c42d (Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents: 11659
diff changeset
2161 overlay_strings (pos, w, pstr)
efef31f1c42d (Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents: 11659
diff changeset
2162 int pos;
efef31f1c42d (Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents: 11659
diff changeset
2163 struct window *w;
16243
b311d8755530 (overlay_strings): Declare pstr using unsigned char.
Richard M. Stallman <rms@gnu.org>
parents: 16213
diff changeset
2164 unsigned char **pstr;
11693
efef31f1c42d (Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents: 11659
diff changeset
2165 {
12697
9ebf33d6d07c (struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents: 12538
diff changeset
2166 Lisp_Object ov, overlay, window, str;
11693
efef31f1c42d (Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents: 11659
diff changeset
2167 int startpos, endpos;
efef31f1c42d (Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents: 11659
diff changeset
2168
12697
9ebf33d6d07c (struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents: 12538
diff changeset
2169 overlay_heads.used = overlay_heads.bytes = 0;
9ebf33d6d07c (struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents: 12538
diff changeset
2170 overlay_tails.used = overlay_tails.bytes = 0;
11693
efef31f1c42d (Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents: 11659
diff changeset
2171 for (ov = current_buffer->overlays_before; CONSP (ov); ov = XCONS (ov)->cdr)
efef31f1c42d (Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents: 11659
diff changeset
2172 {
efef31f1c42d (Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents: 11659
diff changeset
2173 overlay = XCONS (ov)->car;
efef31f1c42d (Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents: 11659
diff changeset
2174 if (!OVERLAYP (overlay))
efef31f1c42d (Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents: 11659
diff changeset
2175 abort ();
efef31f1c42d (Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents: 11659
diff changeset
2176
efef31f1c42d (Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents: 11659
diff changeset
2177 startpos = OVERLAY_POSITION (OVERLAY_START (overlay));
efef31f1c42d (Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents: 11659
diff changeset
2178 endpos = OVERLAY_POSITION (OVERLAY_END (overlay));
efef31f1c42d (Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents: 11659
diff changeset
2179 if (endpos < pos)
efef31f1c42d (Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents: 11659
diff changeset
2180 break;
efef31f1c42d (Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents: 11659
diff changeset
2181 if (endpos != pos && startpos != pos)
efef31f1c42d (Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents: 11659
diff changeset
2182 continue;
efef31f1c42d (Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents: 11659
diff changeset
2183 window = Foverlay_get (overlay, Qwindow);
efef31f1c42d (Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents: 11659
diff changeset
2184 if (WINDOWP (window) && XWINDOW (window) != w)
efef31f1c42d (Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents: 11659
diff changeset
2185 continue;
12697
9ebf33d6d07c (struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents: 12538
diff changeset
2186 if (startpos == pos
9ebf33d6d07c (struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents: 12538
diff changeset
2187 && (str = Foverlay_get (overlay, Qbefore_string), STRINGP (str)))
9ebf33d6d07c (struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents: 12538
diff changeset
2188 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
2189 (startpos == endpos
d0f4113de2ea (record_overlay_string, overlay_strings): Handle zero-sized overlays better.
Karl Heuer <kwzh@gnu.org>
parents: 12697
diff changeset
2190 ? 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
2191 : Qnil),
d0f4113de2ea (record_overlay_string, overlay_strings): Handle zero-sized overlays better.
Karl Heuer <kwzh@gnu.org>
parents: 12697
diff changeset
2192 Foverlay_get (overlay, Qpriority),
d0f4113de2ea (record_overlay_string, overlay_strings): Handle zero-sized overlays better.
Karl Heuer <kwzh@gnu.org>
parents: 12697
diff changeset
2193 endpos - startpos);
d0f4113de2ea (record_overlay_string, overlay_strings): Handle zero-sized overlays better.
Karl Heuer <kwzh@gnu.org>
parents: 12697
diff changeset
2194 else if (endpos == pos
d0f4113de2ea (record_overlay_string, overlay_strings): Handle zero-sized overlays better.
Karl Heuer <kwzh@gnu.org>
parents: 12697
diff changeset
2195 && (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
2196 record_overlay_string (&overlay_tails, str, Qnil,
12697
9ebf33d6d07c (struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents: 12538
diff changeset
2197 Foverlay_get (overlay, Qpriority),
9ebf33d6d07c (struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents: 12538
diff changeset
2198 endpos - startpos);
11693
efef31f1c42d (Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents: 11659
diff changeset
2199 }
efef31f1c42d (Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents: 11659
diff changeset
2200 for (ov = current_buffer->overlays_after; CONSP (ov); ov = XCONS (ov)->cdr)
efef31f1c42d (Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents: 11659
diff changeset
2201 {
efef31f1c42d (Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents: 11659
diff changeset
2202 overlay = XCONS (ov)->car;
efef31f1c42d (Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents: 11659
diff changeset
2203 if (!OVERLAYP (overlay))
efef31f1c42d (Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents: 11659
diff changeset
2204 abort ();
efef31f1c42d (Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents: 11659
diff changeset
2205
efef31f1c42d (Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents: 11659
diff changeset
2206 startpos = OVERLAY_POSITION (OVERLAY_START (overlay));
efef31f1c42d (Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents: 11659
diff changeset
2207 endpos = OVERLAY_POSITION (OVERLAY_END (overlay));
efef31f1c42d (Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents: 11659
diff changeset
2208 if (startpos > pos)
efef31f1c42d (Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents: 11659
diff changeset
2209 break;
12697
9ebf33d6d07c (struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents: 12538
diff changeset
2210 if (endpos != pos && startpos != pos)
9ebf33d6d07c (struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents: 12538
diff changeset
2211 continue;
9ebf33d6d07c (struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents: 12538
diff changeset
2212 window = Foverlay_get (overlay, Qwindow);
9ebf33d6d07c (struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents: 12538
diff changeset
2213 if (WINDOWP (window) && XWINDOW (window) != w)
9ebf33d6d07c (struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents: 12538
diff changeset
2214 continue;
9ebf33d6d07c (struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents: 12538
diff changeset
2215 if (startpos == pos
9ebf33d6d07c (struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents: 12538
diff changeset
2216 && (str = Foverlay_get (overlay, Qbefore_string), STRINGP (str)))
9ebf33d6d07c (struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents: 12538
diff changeset
2217 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
2218 (startpos == endpos
d0f4113de2ea (record_overlay_string, overlay_strings): Handle zero-sized overlays better.
Karl Heuer <kwzh@gnu.org>
parents: 12697
diff changeset
2219 ? 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
2220 : Qnil),
d0f4113de2ea (record_overlay_string, overlay_strings): Handle zero-sized overlays better.
Karl Heuer <kwzh@gnu.org>
parents: 12697
diff changeset
2221 Foverlay_get (overlay, Qpriority),
d0f4113de2ea (record_overlay_string, overlay_strings): Handle zero-sized overlays better.
Karl Heuer <kwzh@gnu.org>
parents: 12697
diff changeset
2222 endpos - startpos);
d0f4113de2ea (record_overlay_string, overlay_strings): Handle zero-sized overlays better.
Karl Heuer <kwzh@gnu.org>
parents: 12697
diff changeset
2223 else if (endpos == pos
d0f4113de2ea (record_overlay_string, overlay_strings): Handle zero-sized overlays better.
Karl Heuer <kwzh@gnu.org>
parents: 12697
diff changeset
2224 && (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
2225 record_overlay_string (&overlay_tails, str, Qnil,
12697
9ebf33d6d07c (struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents: 12538
diff changeset
2226 Foverlay_get (overlay, Qpriority),
9ebf33d6d07c (struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents: 12538
diff changeset
2227 endpos - startpos);
11693
efef31f1c42d (Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents: 11659
diff changeset
2228 }
12697
9ebf33d6d07c (struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents: 12538
diff changeset
2229 if (overlay_tails.used > 1)
9ebf33d6d07c (struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents: 12538
diff changeset
2230 qsort (overlay_tails.buf, overlay_tails.used, sizeof (struct sortstr),
9ebf33d6d07c (struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents: 12538
diff changeset
2231 cmp_for_strings);
9ebf33d6d07c (struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents: 12538
diff changeset
2232 if (overlay_heads.used > 1)
9ebf33d6d07c (struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents: 12538
diff changeset
2233 qsort (overlay_heads.buf, overlay_heads.used, sizeof (struct sortstr),
9ebf33d6d07c (struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents: 12538
diff changeset
2234 cmp_for_strings);
9ebf33d6d07c (struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents: 12538
diff changeset
2235 if (overlay_heads.bytes || overlay_tails.bytes)
11693
efef31f1c42d (Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents: 11659
diff changeset
2236 {
12697
9ebf33d6d07c (struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents: 12538
diff changeset
2237 Lisp_Object tem;
11693
efef31f1c42d (Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents: 11659
diff changeset
2238 int i;
efef31f1c42d (Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents: 11659
diff changeset
2239 char *p;
12697
9ebf33d6d07c (struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents: 12538
diff changeset
2240 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
2241
efef31f1c42d (Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents: 11659
diff changeset
2242 if (total > overlay_str_len)
12697
9ebf33d6d07c (struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents: 12538
diff changeset
2243 overlay_str_buf = (char *)xrealloc (overlay_str_buf,
9ebf33d6d07c (struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents: 12538
diff changeset
2244 overlay_str_len = total);
9ebf33d6d07c (struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents: 12538
diff changeset
2245 p = overlay_str_buf;
9ebf33d6d07c (struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents: 12538
diff changeset
2246 for (i = overlay_tails.used; --i >= 0;)
11693
efef31f1c42d (Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents: 11659
diff changeset
2247 {
12697
9ebf33d6d07c (struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents: 12538
diff changeset
2248 tem = overlay_tails.buf[i].string;
11693
efef31f1c42d (Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents: 11659
diff changeset
2249 bcopy (XSTRING (tem)->data, p, XSTRING (tem)->size);
efef31f1c42d (Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents: 11659
diff changeset
2250 p += XSTRING (tem)->size;
efef31f1c42d (Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents: 11659
diff changeset
2251 }
12697
9ebf33d6d07c (struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents: 12538
diff changeset
2252 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
2253 {
12697
9ebf33d6d07c (struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents: 12538
diff changeset
2254 tem = overlay_heads.buf[i].string;
11693
efef31f1c42d (Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents: 11659
diff changeset
2255 bcopy (XSTRING (tem)->data, p, XSTRING (tem)->size);
efef31f1c42d (Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents: 11659
diff changeset
2256 p += XSTRING (tem)->size;
12699
d0f4113de2ea (record_overlay_string, overlay_strings): Handle zero-sized overlays better.
Karl Heuer <kwzh@gnu.org>
parents: 12697
diff changeset
2257 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
2258 if (STRINGP (tem))
d0f4113de2ea (record_overlay_string, overlay_strings): Handle zero-sized overlays better.
Karl Heuer <kwzh@gnu.org>
parents: 12697
diff changeset
2259 {
d0f4113de2ea (record_overlay_string, overlay_strings): Handle zero-sized overlays better.
Karl Heuer <kwzh@gnu.org>
parents: 12697
diff changeset
2260 bcopy (XSTRING (tem)->data, p, XSTRING (tem)->size);
d0f4113de2ea (record_overlay_string, overlay_strings): Handle zero-sized overlays better.
Karl Heuer <kwzh@gnu.org>
parents: 12697
diff changeset
2261 p += XSTRING (tem)->size;
d0f4113de2ea (record_overlay_string, overlay_strings): Handle zero-sized overlays better.
Karl Heuer <kwzh@gnu.org>
parents: 12697
diff changeset
2262 }
11693
efef31f1c42d (Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents: 11659
diff changeset
2263 }
12699
d0f4113de2ea (record_overlay_string, overlay_strings): Handle zero-sized overlays better.
Karl Heuer <kwzh@gnu.org>
parents: 12697
diff changeset
2264 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
2265 abort ();
11693
efef31f1c42d (Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents: 11659
diff changeset
2266 if (pstr)
efef31f1c42d (Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents: 11659
diff changeset
2267 *pstr = overlay_str_buf;
12697
9ebf33d6d07c (struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents: 12538
diff changeset
2268 return total;
11693
efef31f1c42d (Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents: 11659
diff changeset
2269 }
12697
9ebf33d6d07c (struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents: 12538
diff changeset
2270 return 0;
11693
efef31f1c42d (Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents: 11659
diff changeset
2271 }
efef31f1c42d (Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents: 11659
diff changeset
2272
2508
3aa2f3b35353 * buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents: 2486
diff changeset
2273 /* Shift overlays in BUF's overlay lists, to center the lists at POS. */
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
2274
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
2275 void
2508
3aa2f3b35353 * buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents: 2486
diff changeset
2276 recenter_overlay_lists (buf, pos)
3aa2f3b35353 * buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents: 2486
diff changeset
2277 struct buffer *buf;
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
2278 int pos;
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
2279 {
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
2280 Lisp_Object overlay, tail, next, prev, beg, end;
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
2281
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
2282 /* 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
2283
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
2284 /* 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
2285 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
2286 with some future change. */
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
2287 prev = Qnil;
2508
3aa2f3b35353 * buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents: 2486
diff changeset
2288 for (tail = buf->overlays_before;
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
2289 CONSP (tail);
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
2290 prev = tail, tail = next)
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
2291 {
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
2292 next = XCONS (tail)->cdr;
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
2293 overlay = XCONS (tail)->car;
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
2294
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
2295 /* 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
2296 if (!OVERLAY_VALID (overlay))
2776
8bf3bb4c20dd * lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents: 2722
diff changeset
2297 #if 1
8bf3bb4c20dd * lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents: 2722
diff changeset
2298 abort ();
8bf3bb4c20dd * lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents: 2722
diff changeset
2299 #else
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
2300 {
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
2301 /* 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
2302 if (!NILP (prev))
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
2303 XCONS (prev)->cdr = next;
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
2304 else
2508
3aa2f3b35353 * buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents: 2486
diff changeset
2305 buf->overlays_before = next;
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
2306 tail = prev;
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
2307 continue;
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
2308 }
2776
8bf3bb4c20dd * lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents: 2722
diff changeset
2309 #endif
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
2310
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
2311 beg = OVERLAY_START (overlay);
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
2312 end = OVERLAY_END (overlay);
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
2313
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
2314 if (OVERLAY_POSITION (end) > pos)
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
2315 {
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
2316 /* OVERLAY needs to be moved. */
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
2317 int where = OVERLAY_POSITION (beg);
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
2318 Lisp_Object other, other_prev;
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
2319
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
2320 /* 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
2321 if (!NILP (prev))
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
2322 XCONS (prev)->cdr = next;
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
2323 else
2508
3aa2f3b35353 * buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents: 2486
diff changeset
2324 buf->overlays_before = next;
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
2325
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
2326 /* Search thru overlays_after for where to put it. */
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
2327 other_prev = Qnil;
2508
3aa2f3b35353 * buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents: 2486
diff changeset
2328 for (other = buf->overlays_after;
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
2329 CONSP (other);
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
2330 other_prev = other, other = XCONS (other)->cdr)
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
2331 {
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
2332 Lisp_Object otherbeg, otheroverlay, follower;
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
2333 int win;
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
2334
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
2335 otheroverlay = XCONS (other)->car;
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
2336 if (! OVERLAY_VALID (otheroverlay))
2776
8bf3bb4c20dd * lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents: 2722
diff changeset
2337 abort ();
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
2338
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
2339 otherbeg = OVERLAY_START (otheroverlay);
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
2340 if (OVERLAY_POSITION (otherbeg) >= where)
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
2341 break;
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
2342 }
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
2343
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
2344 /* Add TAIL to overlays_after before OTHER. */
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
2345 XCONS (tail)->cdr = other;
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
2346 if (!NILP (other_prev))
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
2347 XCONS (other_prev)->cdr = tail;
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
2348 else
2508
3aa2f3b35353 * buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents: 2486
diff changeset
2349 buf->overlays_after = tail;
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
2350 tail = prev;
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
2351 }
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
2352 else
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
2353 /* 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
2354 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
2355 so stop now. */
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
2356 break;
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
2357 }
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
2358
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
2359 /* See if anything in overlays_after should be in overlays_before. */
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
2360 prev = Qnil;
2508
3aa2f3b35353 * buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents: 2486
diff changeset
2361 for (tail = buf->overlays_after;
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
2362 CONSP (tail);
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
2363 prev = tail, tail = next)
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
2364 {
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
2365 next = XCONS (tail)->cdr;
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
2366 overlay = XCONS (tail)->car;
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
2367
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
2368 /* 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
2369 if (!OVERLAY_VALID (overlay))
2776
8bf3bb4c20dd * lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents: 2722
diff changeset
2370 #if 1
8bf3bb4c20dd * lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents: 2722
diff changeset
2371 abort ();
8bf3bb4c20dd * lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents: 2722
diff changeset
2372 #else
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
2373 {
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
2374 /* 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
2375 if (!NILP (prev))
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
2376 XCONS (prev)->cdr = next;
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
2377 else
2508
3aa2f3b35353 * buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents: 2486
diff changeset
2378 buf->overlays_after = next;
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
2379 tail = prev;
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
2380 continue;
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
2381 }
2776
8bf3bb4c20dd * lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents: 2722
diff changeset
2382 #endif
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
2383
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
2384 beg = OVERLAY_START (overlay);
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
2385 end = OVERLAY_END (overlay);
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
2386
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
2387 /* Stop looking, when we know that nothing further
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
2388 can possibly end before POS. */
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
2389 if (OVERLAY_POSITION (beg) > pos)
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
2390 break;
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
2391
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
2392 if (OVERLAY_POSITION (end) <= pos)
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
2393 {
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
2394 /* OVERLAY needs to be moved. */
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
2395 int where = OVERLAY_POSITION (end);
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
2396 Lisp_Object other, other_prev;
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
2397
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
2398 /* 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
2399 if (!NILP (prev))
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
2400 XCONS (prev)->cdr = next;
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
2401 else
2508
3aa2f3b35353 * buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents: 2486
diff changeset
2402 buf->overlays_after = next;
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
2403
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
2404 /* Search thru overlays_before for where to put it. */
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
2405 other_prev = Qnil;
2508
3aa2f3b35353 * buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents: 2486
diff changeset
2406 for (other = buf->overlays_before;
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
2407 CONSP (other);
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
2408 other_prev = other, other = XCONS (other)->cdr)
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
2409 {
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
2410 Lisp_Object otherend, otheroverlay;
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
2411 int win;
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
2412
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
2413 otheroverlay = XCONS (other)->car;
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
2414 if (! OVERLAY_VALID (otheroverlay))
2776
8bf3bb4c20dd * lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents: 2722
diff changeset
2415 abort ();
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
2416
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
2417 otherend = OVERLAY_END (otheroverlay);
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
2418 if (OVERLAY_POSITION (otherend) <= where)
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
2419 break;
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
2420 }
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
2421
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
2422 /* Add TAIL to overlays_before before OTHER. */
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
2423 XCONS (tail)->cdr = other;
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
2424 if (!NILP (other_prev))
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
2425 XCONS (other_prev)->cdr = tail;
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
2426 else
2508
3aa2f3b35353 * buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents: 2486
diff changeset
2427 buf->overlays_before = tail;
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
2428 tail = prev;
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
2429 }
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
2430 }
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
2431
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
2432 XSETFASTINT (buf->overlay_center, pos);
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
2433 }
7520
6cc6328992d6 (fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents: 7492
diff changeset
2434
11473
24ede15e0aaa (adjust_overlays_for_insert): New function.
Karl Heuer <kwzh@gnu.org>
parents: 11418
diff changeset
2435 void
24ede15e0aaa (adjust_overlays_for_insert): New function.
Karl Heuer <kwzh@gnu.org>
parents: 11418
diff changeset
2436 adjust_overlays_for_insert (pos, length)
24ede15e0aaa (adjust_overlays_for_insert): New function.
Karl Heuer <kwzh@gnu.org>
parents: 11418
diff changeset
2437 int pos;
24ede15e0aaa (adjust_overlays_for_insert): New function.
Karl Heuer <kwzh@gnu.org>
parents: 11418
diff changeset
2438 int length;
24ede15e0aaa (adjust_overlays_for_insert): New function.
Karl Heuer <kwzh@gnu.org>
parents: 11418
diff changeset
2439 {
24ede15e0aaa (adjust_overlays_for_insert): New function.
Karl Heuer <kwzh@gnu.org>
parents: 11418
diff changeset
2440 /* 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
2441 but we may need to update the value of the overlay center. */
24ede15e0aaa (adjust_overlays_for_insert): New function.
Karl Heuer <kwzh@gnu.org>
parents: 11418
diff changeset
2442 if (XFASTINT (current_buffer->overlay_center) >= pos)
24ede15e0aaa (adjust_overlays_for_insert): New function.
Karl Heuer <kwzh@gnu.org>
parents: 11418
diff changeset
2443 XSETFASTINT (current_buffer->overlay_center,
24ede15e0aaa (adjust_overlays_for_insert): New function.
Karl Heuer <kwzh@gnu.org>
parents: 11418
diff changeset
2444 XFASTINT (current_buffer->overlay_center) + length);
24ede15e0aaa (adjust_overlays_for_insert): New function.
Karl Heuer <kwzh@gnu.org>
parents: 11418
diff changeset
2445 }
24ede15e0aaa (adjust_overlays_for_insert): New function.
Karl Heuer <kwzh@gnu.org>
parents: 11418
diff changeset
2446
24ede15e0aaa (adjust_overlays_for_insert): New function.
Karl Heuer <kwzh@gnu.org>
parents: 11418
diff changeset
2447 void
24ede15e0aaa (adjust_overlays_for_insert): New function.
Karl Heuer <kwzh@gnu.org>
parents: 11418
diff changeset
2448 adjust_overlays_for_delete (pos, length)
24ede15e0aaa (adjust_overlays_for_insert): New function.
Karl Heuer <kwzh@gnu.org>
parents: 11418
diff changeset
2449 int pos;
24ede15e0aaa (adjust_overlays_for_insert): New function.
Karl Heuer <kwzh@gnu.org>
parents: 11418
diff changeset
2450 int length;
24ede15e0aaa (adjust_overlays_for_insert): New function.
Karl Heuer <kwzh@gnu.org>
parents: 11418
diff changeset
2451 {
24ede15e0aaa (adjust_overlays_for_insert): New function.
Karl Heuer <kwzh@gnu.org>
parents: 11418
diff changeset
2452 if (XFASTINT (current_buffer->overlay_center) < pos)
24ede15e0aaa (adjust_overlays_for_insert): New function.
Karl Heuer <kwzh@gnu.org>
parents: 11418
diff changeset
2453 /* 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
2454 after-lists are still consistent. */
24ede15e0aaa (adjust_overlays_for_insert): New function.
Karl Heuer <kwzh@gnu.org>
parents: 11418
diff changeset
2455 ;
24ede15e0aaa (adjust_overlays_for_insert): New function.
Karl Heuer <kwzh@gnu.org>
parents: 11418
diff changeset
2456 else if (XFASTINT (current_buffer->overlay_center) > pos + length)
24ede15e0aaa (adjust_overlays_for_insert): New function.
Karl Heuer <kwzh@gnu.org>
parents: 11418
diff changeset
2457 /* 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
2458 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
2459 given the new value. */
24ede15e0aaa (adjust_overlays_for_insert): New function.
Karl Heuer <kwzh@gnu.org>
parents: 11418
diff changeset
2460 XSETFASTINT (current_buffer->overlay_center,
24ede15e0aaa (adjust_overlays_for_insert): New function.
Karl Heuer <kwzh@gnu.org>
parents: 11418
diff changeset
2461 XFASTINT (current_buffer->overlay_center) - length);
24ede15e0aaa (adjust_overlays_for_insert): New function.
Karl Heuer <kwzh@gnu.org>
parents: 11418
diff changeset
2462 else
24ede15e0aaa (adjust_overlays_for_insert): New function.
Karl Heuer <kwzh@gnu.org>
parents: 11418
diff changeset
2463 /* 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
2464 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
2465 and also update the center point. */
24ede15e0aaa (adjust_overlays_for_insert): New function.
Karl Heuer <kwzh@gnu.org>
parents: 11418
diff changeset
2466 recenter_overlay_lists (current_buffer, pos);
24ede15e0aaa (adjust_overlays_for_insert): New function.
Karl Heuer <kwzh@gnu.org>
parents: 11418
diff changeset
2467 }
24ede15e0aaa (adjust_overlays_for_insert): New function.
Karl Heuer <kwzh@gnu.org>
parents: 11418
diff changeset
2468
7520
6cc6328992d6 (fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents: 7492
diff changeset
2469 /* 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
2470 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
2471 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
2472 list and reinserted in its proper place.
6cc6328992d6 (fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents: 7492
diff changeset
2473 Such an overlay might even have negative size at this point.
6cc6328992d6 (fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents: 7492
diff changeset
2474 If so, we'll reverse the endpoints. Can you think of anything
6cc6328992d6 (fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents: 7492
diff changeset
2475 better to do in this situation? */
6cc6328992d6 (fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents: 7492
diff changeset
2476 void
6cc6328992d6 (fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents: 7492
diff changeset
2477 fix_overlays_in_range (start, end)
6cc6328992d6 (fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents: 7492
diff changeset
2478 register int start, end;
6cc6328992d6 (fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents: 7492
diff changeset
2479 {
6cc6328992d6 (fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents: 7492
diff changeset
2480 Lisp_Object tem, overlay;
6cc6328992d6 (fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents: 7492
diff changeset
2481 Lisp_Object before_list, after_list;
6cc6328992d6 (fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents: 7492
diff changeset
2482 Lisp_Object *ptail, *pbefore = &before_list, *pafter = &after_list;
6cc6328992d6 (fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents: 7492
diff changeset
2483 int startpos, endpos;
6cc6328992d6 (fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents: 7492
diff changeset
2484
6cc6328992d6 (fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents: 7492
diff changeset
2485 /* 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
2486 The loop invariant is that before_list (resp. after_list) is a
6cc6328992d6 (fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents: 7492
diff changeset
2487 well-formed list except that its last element, the one that
6cc6328992d6 (fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents: 7492
diff changeset
2488 *pbefore (resp. *pafter) points to, is still uninitialized.
6cc6328992d6 (fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents: 7492
diff changeset
2489 So it's not a bug that before_list isn't initialized, although
6cc6328992d6 (fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents: 7492
diff changeset
2490 it may look strange. */
6cc6328992d6 (fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents: 7492
diff changeset
2491 for (ptail = &current_buffer->overlays_before; CONSP (*ptail);)
6cc6328992d6 (fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents: 7492
diff changeset
2492 {
6cc6328992d6 (fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents: 7492
diff changeset
2493 overlay = XCONS (*ptail)->car;
6cc6328992d6 (fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents: 7492
diff changeset
2494 endpos = OVERLAY_POSITION (OVERLAY_END (overlay));
6cc6328992d6 (fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents: 7492
diff changeset
2495 if (endpos < start)
6cc6328992d6 (fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents: 7492
diff changeset
2496 break;
6cc6328992d6 (fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents: 7492
diff changeset
2497 startpos = OVERLAY_POSITION (OVERLAY_START (overlay));
6cc6328992d6 (fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents: 7492
diff changeset
2498 if (endpos < end
6cc6328992d6 (fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents: 7492
diff changeset
2499 || (startpos >= start && startpos < end))
6cc6328992d6 (fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents: 7492
diff changeset
2500 {
6cc6328992d6 (fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents: 7492
diff changeset
2501 /* If the overlay is backwards, fix that now. */
6cc6328992d6 (fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents: 7492
diff changeset
2502 if (startpos > endpos)
6cc6328992d6 (fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents: 7492
diff changeset
2503 {
6cc6328992d6 (fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents: 7492
diff changeset
2504 int tem;
6cc6328992d6 (fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents: 7492
diff changeset
2505 Fset_marker (OVERLAY_START (overlay), endpos, Qnil);
6cc6328992d6 (fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents: 7492
diff changeset
2506 Fset_marker (OVERLAY_END (overlay), startpos, Qnil);
6cc6328992d6 (fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents: 7492
diff changeset
2507 tem = startpos; startpos = endpos; endpos = tem;
6cc6328992d6 (fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents: 7492
diff changeset
2508 }
6cc6328992d6 (fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents: 7492
diff changeset
2509 /* 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
2510 recenter_overlay_lists will move it to the right place. */
6cc6328992d6 (fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents: 7492
diff changeset
2511 if (endpos < XINT (current_buffer->overlay_center))
6cc6328992d6 (fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents: 7492
diff changeset
2512 {
6cc6328992d6 (fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents: 7492
diff changeset
2513 *pafter = *ptail;
6cc6328992d6 (fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents: 7492
diff changeset
2514 pafter = &XCONS (*ptail)->cdr;
6cc6328992d6 (fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents: 7492
diff changeset
2515 }
6cc6328992d6 (fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents: 7492
diff changeset
2516 else
6cc6328992d6 (fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents: 7492
diff changeset
2517 {
6cc6328992d6 (fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents: 7492
diff changeset
2518 *pbefore = *ptail;
6cc6328992d6 (fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents: 7492
diff changeset
2519 pbefore = &XCONS (*ptail)->cdr;
6cc6328992d6 (fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents: 7492
diff changeset
2520 }
6cc6328992d6 (fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents: 7492
diff changeset
2521 *ptail = XCONS (*ptail)->cdr;
6cc6328992d6 (fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents: 7492
diff changeset
2522 }
6cc6328992d6 (fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents: 7492
diff changeset
2523 else
6cc6328992d6 (fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents: 7492
diff changeset
2524 ptail = &XCONS (*ptail)->cdr;
6cc6328992d6 (fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents: 7492
diff changeset
2525 }
6cc6328992d6 (fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents: 7492
diff changeset
2526 for (ptail = &current_buffer->overlays_after; CONSP (*ptail);)
6cc6328992d6 (fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents: 7492
diff changeset
2527 {
6cc6328992d6 (fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents: 7492
diff changeset
2528 overlay = XCONS (*ptail)->car;
6cc6328992d6 (fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents: 7492
diff changeset
2529 startpos = OVERLAY_POSITION (OVERLAY_START (overlay));
6cc6328992d6 (fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents: 7492
diff changeset
2530 if (startpos >= end)
6cc6328992d6 (fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents: 7492
diff changeset
2531 break;
6cc6328992d6 (fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents: 7492
diff changeset
2532 endpos = OVERLAY_POSITION (OVERLAY_END (overlay));
6cc6328992d6 (fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents: 7492
diff changeset
2533 if (startpos >= start
6cc6328992d6 (fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents: 7492
diff changeset
2534 || (endpos >= start && endpos < end))
6cc6328992d6 (fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents: 7492
diff changeset
2535 {
6cc6328992d6 (fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents: 7492
diff changeset
2536 if (startpos > endpos)
6cc6328992d6 (fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents: 7492
diff changeset
2537 {
6cc6328992d6 (fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents: 7492
diff changeset
2538 int tem;
6cc6328992d6 (fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents: 7492
diff changeset
2539 Fset_marker (OVERLAY_START (overlay), endpos, Qnil);
6cc6328992d6 (fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents: 7492
diff changeset
2540 Fset_marker (OVERLAY_END (overlay), startpos, Qnil);
6cc6328992d6 (fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents: 7492
diff changeset
2541 tem = startpos; startpos = endpos; endpos = tem;
6cc6328992d6 (fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents: 7492
diff changeset
2542 }
6cc6328992d6 (fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents: 7492
diff changeset
2543 if (endpos < XINT (current_buffer->overlay_center))
6cc6328992d6 (fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents: 7492
diff changeset
2544 {
6cc6328992d6 (fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents: 7492
diff changeset
2545 *pafter = *ptail;
6cc6328992d6 (fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents: 7492
diff changeset
2546 pafter = &XCONS (*ptail)->cdr;
6cc6328992d6 (fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents: 7492
diff changeset
2547 }
6cc6328992d6 (fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents: 7492
diff changeset
2548 else
6cc6328992d6 (fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents: 7492
diff changeset
2549 {
6cc6328992d6 (fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents: 7492
diff changeset
2550 *pbefore = *ptail;
6cc6328992d6 (fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents: 7492
diff changeset
2551 pbefore = &XCONS (*ptail)->cdr;
6cc6328992d6 (fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents: 7492
diff changeset
2552 }
6cc6328992d6 (fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents: 7492
diff changeset
2553 *ptail = XCONS (*ptail)->cdr;
6cc6328992d6 (fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents: 7492
diff changeset
2554 }
6cc6328992d6 (fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents: 7492
diff changeset
2555 else
6cc6328992d6 (fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents: 7492
diff changeset
2556 ptail = &XCONS (*ptail)->cdr;
6cc6328992d6 (fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents: 7492
diff changeset
2557 }
6cc6328992d6 (fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents: 7492
diff changeset
2558
6cc6328992d6 (fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents: 7492
diff changeset
2559 /* 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
2560 and let the recenter function make it sane again. */
6cc6328992d6 (fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents: 7492
diff changeset
2561 *pbefore = current_buffer->overlays_before;
6cc6328992d6 (fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents: 7492
diff changeset
2562 current_buffer->overlays_before = before_list;
6cc6328992d6 (fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents: 7492
diff changeset
2563 recenter_overlay_lists (current_buffer,
6cc6328992d6 (fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents: 7492
diff changeset
2564 XINT (current_buffer->overlay_center));
6cc6328992d6 (fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents: 7492
diff changeset
2565
6cc6328992d6 (fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents: 7492
diff changeset
2566 *pafter = current_buffer->overlays_after;
6cc6328992d6 (fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents: 7492
diff changeset
2567 current_buffer->overlays_after = after_list;
6cc6328992d6 (fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents: 7492
diff changeset
2568 recenter_overlay_lists (current_buffer,
6cc6328992d6 (fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents: 7492
diff changeset
2569 XINT (current_buffer->overlay_center));
6cc6328992d6 (fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents: 7492
diff changeset
2570 }
17022
907fb167f7de Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16840
diff changeset
2571
907fb167f7de Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16840
diff changeset
2572 /* We have two types of overlay: the one whose ending marker is
907fb167f7de Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16840
diff changeset
2573 after-insertion-marker (this is the usual case) and the one whose
907fb167f7de Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16840
diff changeset
2574 ending marker is before-insertion-marker. When `overlays_before'
907fb167f7de Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16840
diff changeset
2575 contains overlays of the latter type and the former type in this
907fb167f7de Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16840
diff changeset
2576 order and both overlays end at inserting position, inserting a text
907fb167f7de Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16840
diff changeset
2577 increases only the ending marker of the latter type, which results
907fb167f7de Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16840
diff changeset
2578 in incorrect ordering of `overlays_before'.
907fb167f7de Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16840
diff changeset
2579
907fb167f7de Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16840
diff changeset
2580 This function fixes ordering of overlays in the slot
907fb167f7de Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16840
diff changeset
2581 `overlays_before' of the buffer *BP. Before the insertion, `point'
907fb167f7de Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16840
diff changeset
2582 was at PREV, and now is at POS. */
907fb167f7de Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16840
diff changeset
2583
907fb167f7de Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16840
diff changeset
2584 fix_overlays_before (bp, prev, pos)
907fb167f7de Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16840
diff changeset
2585 struct buffer *bp;
907fb167f7de Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16840
diff changeset
2586 int prev, pos;
907fb167f7de Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16840
diff changeset
2587 {
907fb167f7de Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16840
diff changeset
2588 Lisp_Object *tailp = &bp->overlays_before;
907fb167f7de Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16840
diff changeset
2589 Lisp_Object *right_place;
907fb167f7de Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16840
diff changeset
2590 int end;
907fb167f7de Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16840
diff changeset
2591
907fb167f7de Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16840
diff changeset
2592 /* After the insertion, the several overlays may be in incorrect
907fb167f7de Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16840
diff changeset
2593 order. The possibility is that, in the list `overlays_before',
907fb167f7de Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16840
diff changeset
2594 an overlay which ends at POS appears after an overlay which ends
907fb167f7de Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16840
diff changeset
2595 at PREV. Since POS is greater than PREV, we must fix the
907fb167f7de Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16840
diff changeset
2596 ordering of these overlays, by moving overlays ends at POS before
907fb167f7de Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16840
diff changeset
2597 the overlays ends at PREV. */
907fb167f7de Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16840
diff changeset
2598
907fb167f7de Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16840
diff changeset
2599 /* At first, find a place where disordered overlays should be linked
907fb167f7de Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16840
diff changeset
2600 in. It is where an overlay which end before POS exists. (i.e. an
907fb167f7de Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16840
diff changeset
2601 overlay whose ending marker is after-insertion-marker if disorder
907fb167f7de Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16840
diff changeset
2602 exists). */
907fb167f7de Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16840
diff changeset
2603 while (!NILP (*tailp)
907fb167f7de Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16840
diff changeset
2604 && ((end = OVERLAY_POSITION (OVERLAY_END (XCONS (*tailp)->car)))
907fb167f7de Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16840
diff changeset
2605 >= pos))
907fb167f7de Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16840
diff changeset
2606 tailp = &XCONS (*tailp)->cdr;
907fb167f7de Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16840
diff changeset
2607
907fb167f7de Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16840
diff changeset
2608 /* If we don't find such an overlay,
907fb167f7de Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16840
diff changeset
2609 or the found one ends before PREV,
907fb167f7de Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16840
diff changeset
2610 or the found one is the last one in the list,
907fb167f7de Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16840
diff changeset
2611 we don't have to fix anything. */
907fb167f7de Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16840
diff changeset
2612 if (NILP (*tailp)
907fb167f7de Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16840
diff changeset
2613 || end < prev
907fb167f7de Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16840
diff changeset
2614 || NILP (XCONS (*tailp)->cdr))
907fb167f7de Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16840
diff changeset
2615 return;
907fb167f7de Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16840
diff changeset
2616
907fb167f7de Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16840
diff changeset
2617 right_place = tailp;
907fb167f7de Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16840
diff changeset
2618 tailp = &XCONS (*tailp)->cdr;
907fb167f7de Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16840
diff changeset
2619
907fb167f7de Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16840
diff changeset
2620 /* Now, end position of overlays in the list *TAILP should be before
907fb167f7de Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16840
diff changeset
2621 or equal to PREV. In the loop, an overlay which ends at POS is
907fb167f7de Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16840
diff changeset
2622 moved ahead to the place pointed by RIGHT_PLACE. If we found an
907fb167f7de Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16840
diff changeset
2623 overlay which ends before PREV, the remaining overlays are in
907fb167f7de Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16840
diff changeset
2624 correct order. */
907fb167f7de Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16840
diff changeset
2625 while (!NILP (*tailp))
907fb167f7de Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16840
diff changeset
2626 {
907fb167f7de Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16840
diff changeset
2627 end = OVERLAY_POSITION (OVERLAY_END (XCONS (*tailp)->car));
907fb167f7de Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16840
diff changeset
2628
907fb167f7de Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16840
diff changeset
2629 if (end == pos)
907fb167f7de Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16840
diff changeset
2630 { /* This overlay is disordered. */
907fb167f7de Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16840
diff changeset
2631 Lisp_Object found = *tailp;
907fb167f7de Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16840
diff changeset
2632
907fb167f7de Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16840
diff changeset
2633 /* Unlink the found overlay. */
907fb167f7de Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16840
diff changeset
2634 *tailp = XCONS (found)->cdr;
907fb167f7de Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16840
diff changeset
2635 /* Move an overlay at RIGHT_PLACE to the next of the found one. */
907fb167f7de Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16840
diff changeset
2636 XCONS (found)->cdr = *right_place;
907fb167f7de Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16840
diff changeset
2637 /* Link it into the right place. */
907fb167f7de Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16840
diff changeset
2638 *right_place = found;
907fb167f7de Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16840
diff changeset
2639 }
907fb167f7de Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16840
diff changeset
2640 else if (end == prev)
907fb167f7de Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16840
diff changeset
2641 tailp = &XCONS (*tailp)->cdr;
907fb167f7de Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16840
diff changeset
2642 else /* No more disordered overlay. */
907fb167f7de Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16840
diff changeset
2643 break;
907fb167f7de Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16840
diff changeset
2644 }
907fb167f7de Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16840
diff changeset
2645 }
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
2646
2776
8bf3bb4c20dd * lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents: 2722
diff changeset
2647 DEFUN ("overlayp", Foverlayp, Soverlayp, 1, 1, 0,
8bf3bb4c20dd * lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents: 2722
diff changeset
2648 "Return t if OBJECT is an overlay.")
8bf3bb4c20dd * lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents: 2722
diff changeset
2649 (object)
8bf3bb4c20dd * lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents: 2722
diff changeset
2650 Lisp_Object object;
8bf3bb4c20dd * lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents: 2722
diff changeset
2651 {
8bf3bb4c20dd * lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents: 2722
diff changeset
2652 return (OVERLAYP (object) ? Qt : Qnil);
8bf3bb4c20dd * lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents: 2722
diff changeset
2653 }
8bf3bb4c20dd * lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents: 2722
diff changeset
2654
13446
005d7ed9d69b (Fmake_overlay): New args front-advance and rear-advance.
Richard M. Stallman <rms@gnu.org>
parents: 13270
diff changeset
2655 DEFUN ("make-overlay", Fmake_overlay, Smake_overlay, 2, 5, 0,
2508
3aa2f3b35353 * buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents: 2486
diff changeset
2656 "Create a new overlay with range BEG to END in BUFFER.\n\
3aa2f3b35353 * buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents: 2486
diff changeset
2657 If omitted, BUFFER defaults to the current buffer.\n\
13446
005d7ed9d69b (Fmake_overlay): New args front-advance and rear-advance.
Richard M. Stallman <rms@gnu.org>
parents: 13270
diff changeset
2658 BEG and END may be integers or markers.\n\
005d7ed9d69b (Fmake_overlay): New args front-advance and rear-advance.
Richard M. Stallman <rms@gnu.org>
parents: 13270
diff changeset
2659 The fourth arg FRONT-ADVANCE, if non-nil, makes the\n\
005d7ed9d69b (Fmake_overlay): New args front-advance and rear-advance.
Richard M. Stallman <rms@gnu.org>
parents: 13270
diff changeset
2660 front delimiter advance when text is inserted there.\n\
005d7ed9d69b (Fmake_overlay): New args front-advance and rear-advance.
Richard M. Stallman <rms@gnu.org>
parents: 13270
diff changeset
2661 The fifth arg REAR-ADVANCE, if non-nil, makes the\n\
005d7ed9d69b (Fmake_overlay): New args front-advance and rear-advance.
Richard M. Stallman <rms@gnu.org>
parents: 13270
diff changeset
2662 rear delimiter advance when text is inserted there.")
005d7ed9d69b (Fmake_overlay): New args front-advance and rear-advance.
Richard M. Stallman <rms@gnu.org>
parents: 13270
diff changeset
2663 (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
2664 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
2665 Lisp_Object front_advance, rear_advance;
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
2666 {
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
2667 Lisp_Object overlay;
2508
3aa2f3b35353 * buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents: 2486
diff changeset
2668 struct buffer *b;
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
2669
2508
3aa2f3b35353 * buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents: 2486
diff changeset
2670 if (NILP (buffer))
9262
582534b6e763 (Fget_buffer_create, Frename_buffer, Fbuffer_disable_undo,
Karl Heuer <kwzh@gnu.org>
parents: 9211
diff changeset
2671 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
2672 else
5c96dfc52433 * buffer.c (Fmake_overlay): Put beg and end in the
Jim Blandy <jimb@redhat.com>
parents: 2961
diff changeset
2673 CHECK_BUFFER (buffer, 2);
5c96dfc52433 * buffer.c (Fmake_overlay): Put beg and end in the
Jim Blandy <jimb@redhat.com>
parents: 2961
diff changeset
2674 if (MARKERP (beg)
5c96dfc52433 * buffer.c (Fmake_overlay): Put beg and end in the
Jim Blandy <jimb@redhat.com>
parents: 2961
diff changeset
2675 && ! 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
2676 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
2677 if (MARKERP (end)
5c96dfc52433 * buffer.c (Fmake_overlay): Put beg and end in the
Jim Blandy <jimb@redhat.com>
parents: 2961
diff changeset
2678 && ! 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
2679 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
2680
5c96dfc52433 * buffer.c (Fmake_overlay): Put beg and end in the
Jim Blandy <jimb@redhat.com>
parents: 2961
diff changeset
2681 CHECK_NUMBER_COERCE_MARKER (beg, 1);
5c96dfc52433 * buffer.c (Fmake_overlay): Put beg and end in the
Jim Blandy <jimb@redhat.com>
parents: 2961
diff changeset
2682 CHECK_NUMBER_COERCE_MARKER (end, 1);
5c96dfc52433 * buffer.c (Fmake_overlay): Put beg and end in the
Jim Blandy <jimb@redhat.com>
parents: 2961
diff changeset
2683
5c96dfc52433 * buffer.c (Fmake_overlay): Put beg and end in the
Jim Blandy <jimb@redhat.com>
parents: 2961
diff changeset
2684 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
2685 {
6493
33a461f14903 (sort_overlays, Fmake_overlay): Use assignment, not initialization.
Karl Heuer <kwzh@gnu.org>
parents: 6477
diff changeset
2686 Lisp_Object temp;
33a461f14903 (sort_overlays, Fmake_overlay): Use assignment, not initialization.
Karl Heuer <kwzh@gnu.org>
parents: 6477
diff changeset
2687 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
2688 }
2508
3aa2f3b35353 * buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents: 2486
diff changeset
2689
3aa2f3b35353 * buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents: 2486
diff changeset
2690 b = XBUFFER (buffer);
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
2691
3031
5c96dfc52433 * buffer.c (Fmake_overlay): Put beg and end in the
Jim Blandy <jimb@redhat.com>
parents: 2961
diff changeset
2692 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
2693 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
2694
13446
005d7ed9d69b (Fmake_overlay): New args front-advance and rear-advance.
Richard M. Stallman <rms@gnu.org>
parents: 13270
diff changeset
2695 if (!NILP (front_advance))
005d7ed9d69b (Fmake_overlay): New args front-advance and rear-advance.
Richard M. Stallman <rms@gnu.org>
parents: 13270
diff changeset
2696 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
2697 if (!NILP (rear_advance))
005d7ed9d69b (Fmake_overlay): New args front-advance and rear-advance.
Richard M. Stallman <rms@gnu.org>
parents: 13270
diff changeset
2698 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
2699
9922
f653d8aac66a (Fmake_overlay, Foverlay_properties, Foverlay_get, Foverlay_put): Use new
Karl Heuer <kwzh@gnu.org>
parents: 9920
diff changeset
2700 overlay = allocate_misc ();
11244
f3b11dc9014e (Fmake_overlay): Use XMISCTYPE.
Richard M. Stallman <rms@gnu.org>
parents: 11214
diff changeset
2701 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
2702 XOVERLAY (overlay)->start = beg;
f653d8aac66a (Fmake_overlay, Foverlay_properties, Foverlay_get, Foverlay_put): Use new
Karl Heuer <kwzh@gnu.org>
parents: 9920
diff changeset
2703 XOVERLAY (overlay)->end = end;
f653d8aac66a (Fmake_overlay, Foverlay_properties, Foverlay_get, Foverlay_put): Use new
Karl Heuer <kwzh@gnu.org>
parents: 9920
diff changeset
2704 XOVERLAY (overlay)->plist = Qnil;
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
2705
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
2706 /* Put the new overlay on the wrong list. */
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
2707 end = OVERLAY_END (overlay);
2508
3aa2f3b35353 * buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents: 2486
diff changeset
2708 if (OVERLAY_POSITION (end) < XINT (b->overlay_center))
3aa2f3b35353 * buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents: 2486
diff changeset
2709 b->overlays_after = Fcons (overlay, b->overlays_after);
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
2710 else
2508
3aa2f3b35353 * buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents: 2486
diff changeset
2711 b->overlays_before = Fcons (overlay, b->overlays_before);
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
2712
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
2713 /* This puts it in the right list, and in the right order. */
2508
3aa2f3b35353 * buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents: 2486
diff changeset
2714 recenter_overlay_lists (b, XINT (b->overlay_center));
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
2715
2722
16db9d1af886 Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents: 2645
diff changeset
2716 /* 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
2717 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
2718
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
2719 return overlay;
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
2720 }
16193
6ff2ef91c618 (modify_overlay): Renamed from redisplay_region
Richard M. Stallman <rms@gnu.org>
parents: 16144
diff changeset
2721
6ff2ef91c618 (modify_overlay): Renamed from redisplay_region
Richard M. Stallman <rms@gnu.org>
parents: 16144
diff changeset
2722 /* 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
2723
6ff2ef91c618 (modify_overlay): Renamed from redisplay_region
Richard M. Stallman <rms@gnu.org>
parents: 16144
diff changeset
2724 static void
6ff2ef91c618 (modify_overlay): Renamed from redisplay_region
Richard M. Stallman <rms@gnu.org>
parents: 16144
diff changeset
2725 modify_overlay (buf, start, end)
6ff2ef91c618 (modify_overlay): Renamed from redisplay_region
Richard M. Stallman <rms@gnu.org>
parents: 16144
diff changeset
2726 struct buffer *buf;
6ff2ef91c618 (modify_overlay): Renamed from redisplay_region
Richard M. Stallman <rms@gnu.org>
parents: 16144
diff changeset
2727 int start, end;
6ff2ef91c618 (modify_overlay): Renamed from redisplay_region
Richard M. Stallman <rms@gnu.org>
parents: 16144
diff changeset
2728 {
6ff2ef91c618 (modify_overlay): Renamed from redisplay_region
Richard M. Stallman <rms@gnu.org>
parents: 16144
diff changeset
2729 if (start == end)
6ff2ef91c618 (modify_overlay): Renamed from redisplay_region
Richard M. Stallman <rms@gnu.org>
parents: 16144
diff changeset
2730 return;
6ff2ef91c618 (modify_overlay): Renamed from redisplay_region
Richard M. Stallman <rms@gnu.org>
parents: 16144
diff changeset
2731
6ff2ef91c618 (modify_overlay): Renamed from redisplay_region
Richard M. Stallman <rms@gnu.org>
parents: 16144
diff changeset
2732 if (start > end)
6ff2ef91c618 (modify_overlay): Renamed from redisplay_region
Richard M. Stallman <rms@gnu.org>
parents: 16144
diff changeset
2733 {
6ff2ef91c618 (modify_overlay): Renamed from redisplay_region
Richard M. Stallman <rms@gnu.org>
parents: 16144
diff changeset
2734 int temp = start;
6ff2ef91c618 (modify_overlay): Renamed from redisplay_region
Richard M. Stallman <rms@gnu.org>
parents: 16144
diff changeset
2735 start = end; end = temp;
6ff2ef91c618 (modify_overlay): Renamed from redisplay_region
Richard M. Stallman <rms@gnu.org>
parents: 16144
diff changeset
2736 }
6ff2ef91c618 (modify_overlay): Renamed from redisplay_region
Richard M. Stallman <rms@gnu.org>
parents: 16144
diff changeset
2737
6ff2ef91c618 (modify_overlay): Renamed from redisplay_region
Richard M. Stallman <rms@gnu.org>
parents: 16144
diff changeset
2738 /* 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
2739 we must do other windows. */
6ff2ef91c618 (modify_overlay): Renamed from redisplay_region
Richard M. Stallman <rms@gnu.org>
parents: 16144
diff changeset
2740 if (buf != XBUFFER (XWINDOW (selected_window)->buffer))
6ff2ef91c618 (modify_overlay): Renamed from redisplay_region
Richard M. Stallman <rms@gnu.org>
parents: 16144
diff changeset
2741 windows_or_buffers_changed = 1;
6ff2ef91c618 (modify_overlay): Renamed from redisplay_region
Richard M. Stallman <rms@gnu.org>
parents: 16144
diff changeset
2742 /* If it's not current, we can't use beg_unchanged, end_unchanged for it. */
6ff2ef91c618 (modify_overlay): Renamed from redisplay_region
Richard M. Stallman <rms@gnu.org>
parents: 16144
diff changeset
2743 else if (buf != current_buffer)
6ff2ef91c618 (modify_overlay): Renamed from redisplay_region
Richard M. Stallman <rms@gnu.org>
parents: 16144
diff changeset
2744 windows_or_buffers_changed = 1;
6ff2ef91c618 (modify_overlay): Renamed from redisplay_region
Richard M. Stallman <rms@gnu.org>
parents: 16144
diff changeset
2745 /* 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
2746 else if (buffer_shared > 1)
6ff2ef91c618 (modify_overlay): Renamed from redisplay_region
Richard M. Stallman <rms@gnu.org>
parents: 16144
diff changeset
2747 windows_or_buffers_changed = 1;
6ff2ef91c618 (modify_overlay): Renamed from redisplay_region
Richard M. Stallman <rms@gnu.org>
parents: 16144
diff changeset
2748 else
6ff2ef91c618 (modify_overlay): Renamed from redisplay_region
Richard M. Stallman <rms@gnu.org>
parents: 16144
diff changeset
2749 {
6ff2ef91c618 (modify_overlay): Renamed from redisplay_region
Richard M. Stallman <rms@gnu.org>
parents: 16144
diff changeset
2750 if (unchanged_modified == MODIFF
6ff2ef91c618 (modify_overlay): Renamed from redisplay_region
Richard M. Stallman <rms@gnu.org>
parents: 16144
diff changeset
2751 && overlay_unchanged_modified == OVERLAY_MODIFF)
6ff2ef91c618 (modify_overlay): Renamed from redisplay_region
Richard M. Stallman <rms@gnu.org>
parents: 16144
diff changeset
2752 {
6ff2ef91c618 (modify_overlay): Renamed from redisplay_region
Richard M. Stallman <rms@gnu.org>
parents: 16144
diff changeset
2753 beg_unchanged = start - BEG;
6ff2ef91c618 (modify_overlay): Renamed from redisplay_region
Richard M. Stallman <rms@gnu.org>
parents: 16144
diff changeset
2754 end_unchanged = Z - end;
6ff2ef91c618 (modify_overlay): Renamed from redisplay_region
Richard M. Stallman <rms@gnu.org>
parents: 16144
diff changeset
2755 }
6ff2ef91c618 (modify_overlay): Renamed from redisplay_region
Richard M. Stallman <rms@gnu.org>
parents: 16144
diff changeset
2756 else
6ff2ef91c618 (modify_overlay): Renamed from redisplay_region
Richard M. Stallman <rms@gnu.org>
parents: 16144
diff changeset
2757 {
6ff2ef91c618 (modify_overlay): Renamed from redisplay_region
Richard M. Stallman <rms@gnu.org>
parents: 16144
diff changeset
2758 if (Z - end < end_unchanged)
6ff2ef91c618 (modify_overlay): Renamed from redisplay_region
Richard M. Stallman <rms@gnu.org>
parents: 16144
diff changeset
2759 end_unchanged = Z - end;
6ff2ef91c618 (modify_overlay): Renamed from redisplay_region
Richard M. Stallman <rms@gnu.org>
parents: 16144
diff changeset
2760 if (start - BEG < beg_unchanged)
6ff2ef91c618 (modify_overlay): Renamed from redisplay_region
Richard M. Stallman <rms@gnu.org>
parents: 16144
diff changeset
2761 beg_unchanged = start - BEG;
6ff2ef91c618 (modify_overlay): Renamed from redisplay_region
Richard M. Stallman <rms@gnu.org>
parents: 16144
diff changeset
2762 }
6ff2ef91c618 (modify_overlay): Renamed from redisplay_region
Richard M. Stallman <rms@gnu.org>
parents: 16144
diff changeset
2763 }
6ff2ef91c618 (modify_overlay): Renamed from redisplay_region
Richard M. Stallman <rms@gnu.org>
parents: 16144
diff changeset
2764
6ff2ef91c618 (modify_overlay): Renamed from redisplay_region
Richard M. Stallman <rms@gnu.org>
parents: 16144
diff changeset
2765 ++OVERLAY_MODIFF;
6ff2ef91c618 (modify_overlay): Renamed from redisplay_region
Richard M. Stallman <rms@gnu.org>
parents: 16144
diff changeset
2766 }
6ff2ef91c618 (modify_overlay): Renamed from redisplay_region
Richard M. Stallman <rms@gnu.org>
parents: 16144
diff changeset
2767
6ff2ef91c618 (modify_overlay): Renamed from redisplay_region
Richard M. Stallman <rms@gnu.org>
parents: 16144
diff changeset
2768
2508
3aa2f3b35353 * buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents: 2486
diff changeset
2769 DEFUN ("move-overlay", Fmove_overlay, Smove_overlay, 3, 4, 0,
3aa2f3b35353 * buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents: 2486
diff changeset
2770 "Set the endpoints of OVERLAY to BEG and END in BUFFER.\n\
2791
4f234fbfb02c * buffer.c (Fmove_overlay): If the overlay is in no buffer and the
Jim Blandy <jimb@redhat.com>
parents: 2787
diff changeset
2771 If BUFFER is omitted, leave OVERLAY in the same buffer it inhabits now.\n\
4f234fbfb02c * buffer.c (Fmove_overlay): If the overlay is in no buffer and the
Jim Blandy <jimb@redhat.com>
parents: 2787
diff changeset
2772 If BUFFER is omitted, and OVERLAY is in no buffer, put it in the current\n\
4f234fbfb02c * buffer.c (Fmove_overlay): If the overlay is in no buffer and the
Jim Blandy <jimb@redhat.com>
parents: 2787
diff changeset
2773 buffer.")
2508
3aa2f3b35353 * buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents: 2486
diff changeset
2774 (overlay, beg, end, buffer)
3aa2f3b35353 * buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents: 2486
diff changeset
2775 Lisp_Object overlay, beg, end, buffer;
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
2776 {
3533
78b4e6241f85 (Fdelete_overlay): Do nothing if overlay already deleted.
Richard M. Stallman <rms@gnu.org>
parents: 3481
diff changeset
2777 struct buffer *b, *ob;
78b4e6241f85 (Fdelete_overlay): Do nothing if overlay already deleted.
Richard M. Stallman <rms@gnu.org>
parents: 3481
diff changeset
2778 Lisp_Object obuffer;
78b4e6241f85 (Fdelete_overlay): Do nothing if overlay already deleted.
Richard M. Stallman <rms@gnu.org>
parents: 3481
diff changeset
2779 int count = specpdl_ptr - specpdl;
2508
3aa2f3b35353 * buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents: 2486
diff changeset
2780
2776
8bf3bb4c20dd * lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents: 2722
diff changeset
2781 CHECK_OVERLAY (overlay, 0);
2508
3aa2f3b35353 * buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents: 2486
diff changeset
2782 if (NILP (buffer))
3aa2f3b35353 * buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents: 2486
diff changeset
2783 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
2784 if (NILP (buffer))
9262
582534b6e763 (Fget_buffer_create, Frename_buffer, Fbuffer_disable_undo,
Karl Heuer <kwzh@gnu.org>
parents: 9211
diff changeset
2785 XSETBUFFER (buffer, current_buffer);
2508
3aa2f3b35353 * buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents: 2486
diff changeset
2786 CHECK_BUFFER (buffer, 3);
3031
5c96dfc52433 * buffer.c (Fmake_overlay): Put beg and end in the
Jim Blandy <jimb@redhat.com>
parents: 2961
diff changeset
2787
5c96dfc52433 * buffer.c (Fmake_overlay): Put beg and end in the
Jim Blandy <jimb@redhat.com>
parents: 2961
diff changeset
2788 if (MARKERP (beg)
5c96dfc52433 * buffer.c (Fmake_overlay): Put beg and end in the
Jim Blandy <jimb@redhat.com>
parents: 2961
diff changeset
2789 && ! 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
2790 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
2791 if (MARKERP (end)
5c96dfc52433 * buffer.c (Fmake_overlay): Put beg and end in the
Jim Blandy <jimb@redhat.com>
parents: 2961
diff changeset
2792 && ! 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
2793 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
2794
2722
16db9d1af886 Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents: 2645
diff changeset
2795 CHECK_NUMBER_COERCE_MARKER (beg, 1);
16db9d1af886 Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents: 2645
diff changeset
2796 CHECK_NUMBER_COERCE_MARKER (end, 1);
16db9d1af886 Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents: 2645
diff changeset
2797
8839
41981db9ad8e (Qevaporate): New symbol.
Karl Heuer <kwzh@gnu.org>
parents: 8818
diff changeset
2798 if (XINT (beg) == XINT (end) && ! NILP (Foverlay_get (overlay, Qevaporate)))
41981db9ad8e (Qevaporate): New symbol.
Karl Heuer <kwzh@gnu.org>
parents: 8818
diff changeset
2799 return Fdelete_overlay (overlay);
3533
78b4e6241f85 (Fdelete_overlay): Do nothing if overlay already deleted.
Richard M. Stallman <rms@gnu.org>
parents: 3481
diff changeset
2800
2722
16db9d1af886 Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents: 2645
diff changeset
2801 if (XINT (beg) > XINT (end))
16db9d1af886 Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents: 2645
diff changeset
2802 {
6493
33a461f14903 (sort_overlays, Fmake_overlay): Use assignment, not initialization.
Karl Heuer <kwzh@gnu.org>
parents: 6477
diff changeset
2803 Lisp_Object temp;
33a461f14903 (sort_overlays, Fmake_overlay): Use assignment, not initialization.
Karl Heuer <kwzh@gnu.org>
parents: 6477
diff changeset
2804 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
2805 }
16db9d1af886 Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents: 2645
diff changeset
2806
8839
41981db9ad8e (Qevaporate): New symbol.
Karl Heuer <kwzh@gnu.org>
parents: 8818
diff changeset
2807 specbind (Qinhibit_quit, Qt);
41981db9ad8e (Qevaporate): New symbol.
Karl Heuer <kwzh@gnu.org>
parents: 8818
diff changeset
2808
3533
78b4e6241f85 (Fdelete_overlay): Do nothing if overlay already deleted.
Richard M. Stallman <rms@gnu.org>
parents: 3481
diff changeset
2809 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
2810 b = XBUFFER (buffer);
3533
78b4e6241f85 (Fdelete_overlay): Do nothing if overlay already deleted.
Richard M. Stallman <rms@gnu.org>
parents: 3481
diff changeset
2811 ob = XBUFFER (obuffer);
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
2812
3204
a3007f83650c * buffer.c (Fmove_overlay): If the overlay is changing buffers,
Jim Blandy <jimb@redhat.com>
parents: 3031
diff changeset
2813 /* 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
2814 if (!EQ (buffer, obuffer))
7985
f6c309d5d314 (Fmove_overlay): Call redisplay_region even when
Richard M. Stallman <rms@gnu.org>
parents: 7670
diff changeset
2815 {
f6c309d5d314 (Fmove_overlay): Call redisplay_region even when
Richard M. Stallman <rms@gnu.org>
parents: 7670
diff changeset
2816 /* Redisplay where the overlay was. */
f6c309d5d314 (Fmove_overlay): Call redisplay_region even when
Richard M. Stallman <rms@gnu.org>
parents: 7670
diff changeset
2817 if (!NILP (obuffer))
f6c309d5d314 (Fmove_overlay): Call redisplay_region even when
Richard M. Stallman <rms@gnu.org>
parents: 7670
diff changeset
2818 {
f6c309d5d314 (Fmove_overlay): Call redisplay_region even when
Richard M. Stallman <rms@gnu.org>
parents: 7670
diff changeset
2819 Lisp_Object o_beg;
f6c309d5d314 (Fmove_overlay): Call redisplay_region even when
Richard M. Stallman <rms@gnu.org>
parents: 7670
diff changeset
2820 Lisp_Object o_end;
f6c309d5d314 (Fmove_overlay): Call redisplay_region even when
Richard M. Stallman <rms@gnu.org>
parents: 7670
diff changeset
2821
18105
bc690c1e1950 (Fmove_overlay): Clean up setting o_beg and o_end.
Richard M. Stallman <rms@gnu.org>
parents: 18009
diff changeset
2822 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
2823 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
2824
16193
6ff2ef91c618 (modify_overlay): Renamed from redisplay_region
Richard M. Stallman <rms@gnu.org>
parents: 16144
diff changeset
2825 modify_overlay (ob, XINT (o_beg), XINT (o_end));
7985
f6c309d5d314 (Fmove_overlay): Call redisplay_region even when
Richard M. Stallman <rms@gnu.org>
parents: 7670
diff changeset
2826 }
f6c309d5d314 (Fmove_overlay): Call redisplay_region even when
Richard M. Stallman <rms@gnu.org>
parents: 7670
diff changeset
2827
f6c309d5d314 (Fmove_overlay): Call redisplay_region even when
Richard M. Stallman <rms@gnu.org>
parents: 7670
diff changeset
2828 /* 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
2829 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
2830 }
3204
a3007f83650c * buffer.c (Fmove_overlay): If the overlay is changing buffers,
Jim Blandy <jimb@redhat.com>
parents: 3031
diff changeset
2831 else
a3007f83650c * buffer.c (Fmove_overlay): If the overlay is changing buffers,
Jim Blandy <jimb@redhat.com>
parents: 3031
diff changeset
2832 /* 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
2833 {
4416
9657ef911049 (Fmove_overlay): Avoid initializer for Lisp_Object vars.
Richard M. Stallman <rms@gnu.org>
parents: 4226
diff changeset
2834 Lisp_Object o_beg;
9657ef911049 (Fmove_overlay): Avoid initializer for Lisp_Object vars.
Richard M. Stallman <rms@gnu.org>
parents: 4226
diff changeset
2835 Lisp_Object o_end;
3204
a3007f83650c * buffer.c (Fmove_overlay): If the overlay is changing buffers,
Jim Blandy <jimb@redhat.com>
parents: 3031
diff changeset
2836 int change_beg, change_end;
2722
16db9d1af886 Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents: 2645
diff changeset
2837
18105
bc690c1e1950 (Fmove_overlay): Clean up setting o_beg and o_end.
Richard M. Stallman <rms@gnu.org>
parents: 18009
diff changeset
2838 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
2839 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
2840
a3007f83650c * buffer.c (Fmove_overlay): If the overlay is changing buffers,
Jim Blandy <jimb@redhat.com>
parents: 3031
diff changeset
2841 if (XINT (o_beg) == XINT (beg))
16193
6ff2ef91c618 (modify_overlay): Renamed from redisplay_region
Richard M. Stallman <rms@gnu.org>
parents: 16144
diff changeset
2842 modify_overlay (b, XINT (o_end), XINT (end));
3204
a3007f83650c * buffer.c (Fmove_overlay): If the overlay is changing buffers,
Jim Blandy <jimb@redhat.com>
parents: 3031
diff changeset
2843 else if (XINT (o_end) == XINT (end))
16193
6ff2ef91c618 (modify_overlay): Renamed from redisplay_region
Richard M. Stallman <rms@gnu.org>
parents: 16144
diff changeset
2844 modify_overlay (b, XINT (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
2845 else
a3007f83650c * buffer.c (Fmove_overlay): If the overlay is changing buffers,
Jim Blandy <jimb@redhat.com>
parents: 3031
diff changeset
2846 {
a3007f83650c * buffer.c (Fmove_overlay): If the overlay is changing buffers,
Jim Blandy <jimb@redhat.com>
parents: 3031
diff changeset
2847 if (XINT (beg) < XINT (o_beg)) o_beg = beg;
a3007f83650c * buffer.c (Fmove_overlay): If the overlay is changing buffers,
Jim Blandy <jimb@redhat.com>
parents: 3031
diff changeset
2848 if (XINT (end) > XINT (o_end)) o_end = end;
16193
6ff2ef91c618 (modify_overlay): Renamed from redisplay_region
Richard M. Stallman <rms@gnu.org>
parents: 16144
diff changeset
2849 modify_overlay (b, XINT (o_beg), XINT (o_end));
3204
a3007f83650c * buffer.c (Fmove_overlay): If the overlay is changing buffers,
Jim Blandy <jimb@redhat.com>
parents: 3031
diff changeset
2850 }
a3007f83650c * buffer.c (Fmove_overlay): If the overlay is changing buffers,
Jim Blandy <jimb@redhat.com>
parents: 3031
diff changeset
2851 }
2722
16db9d1af886 Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents: 2645
diff changeset
2852
3533
78b4e6241f85 (Fdelete_overlay): Do nothing if overlay already deleted.
Richard M. Stallman <rms@gnu.org>
parents: 3481
diff changeset
2853 if (!NILP (obuffer))
78b4e6241f85 (Fdelete_overlay): Do nothing if overlay already deleted.
Richard M. Stallman <rms@gnu.org>
parents: 3481
diff changeset
2854 {
78b4e6241f85 (Fdelete_overlay): Do nothing if overlay already deleted.
Richard M. Stallman <rms@gnu.org>
parents: 3481
diff changeset
2855 ob->overlays_before = Fdelq (overlay, ob->overlays_before);
78b4e6241f85 (Fdelete_overlay): Do nothing if overlay already deleted.
Richard M. Stallman <rms@gnu.org>
parents: 3481
diff changeset
2856 ob->overlays_after = Fdelq (overlay, ob->overlays_after);
78b4e6241f85 (Fdelete_overlay): Do nothing if overlay already deleted.
Richard M. Stallman <rms@gnu.org>
parents: 3481
diff changeset
2857 }
2508
3aa2f3b35353 * buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents: 2486
diff changeset
2858
3aa2f3b35353 * buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents: 2486
diff changeset
2859 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
2860 Fset_marker (OVERLAY_END (overlay), end, buffer);
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
2861
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
2862 /* Put the overlay on the wrong list. */
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
2863 end = OVERLAY_END (overlay);
2508
3aa2f3b35353 * buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents: 2486
diff changeset
2864 if (OVERLAY_POSITION (end) < XINT (b->overlay_center))
3aa2f3b35353 * buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents: 2486
diff changeset
2865 b->overlays_after = Fcons (overlay, b->overlays_after);
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
2866 else
2508
3aa2f3b35353 * buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents: 2486
diff changeset
2867 b->overlays_before = Fcons (overlay, b->overlays_before);
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
2868
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
2869 /* This puts it in the right list, and in the right order. */
2508
3aa2f3b35353 * buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents: 2486
diff changeset
2870 recenter_overlay_lists (b, XINT (b->overlay_center));
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
2871
3533
78b4e6241f85 (Fdelete_overlay): Do nothing if overlay already deleted.
Richard M. Stallman <rms@gnu.org>
parents: 3481
diff changeset
2872 return unbind_to (count, overlay);
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
2873 }
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
2874
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
2875 DEFUN ("delete-overlay", Fdelete_overlay, Sdelete_overlay, 1, 1, 0,
2508
3aa2f3b35353 * buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents: 2486
diff changeset
2876 "Delete the overlay OVERLAY from its buffer.")
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
2877 (overlay)
2508
3aa2f3b35353 * buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents: 2486
diff changeset
2878 Lisp_Object overlay;
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
2879 {
3533
78b4e6241f85 (Fdelete_overlay): Do nothing if overlay already deleted.
Richard M. Stallman <rms@gnu.org>
parents: 3481
diff changeset
2880 Lisp_Object buffer;
2508
3aa2f3b35353 * buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents: 2486
diff changeset
2881 struct buffer *b;
3533
78b4e6241f85 (Fdelete_overlay): Do nothing if overlay already deleted.
Richard M. Stallman <rms@gnu.org>
parents: 3481
diff changeset
2882 int count = specpdl_ptr - specpdl;
2508
3aa2f3b35353 * buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents: 2486
diff changeset
2883
2776
8bf3bb4c20dd * lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents: 2722
diff changeset
2884 CHECK_OVERLAY (overlay, 0);
8bf3bb4c20dd * lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents: 2722
diff changeset
2885
3533
78b4e6241f85 (Fdelete_overlay): Do nothing if overlay already deleted.
Richard M. Stallman <rms@gnu.org>
parents: 3481
diff changeset
2886 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
2887 if (NILP (buffer))
78b4e6241f85 (Fdelete_overlay): Do nothing if overlay already deleted.
Richard M. Stallman <rms@gnu.org>
parents: 3481
diff changeset
2888 return Qnil;
78b4e6241f85 (Fdelete_overlay): Do nothing if overlay already deleted.
Richard M. Stallman <rms@gnu.org>
parents: 3481
diff changeset
2889
78b4e6241f85 (Fdelete_overlay): Do nothing if overlay already deleted.
Richard M. Stallman <rms@gnu.org>
parents: 3481
diff changeset
2890 b = XBUFFER (buffer);
78b4e6241f85 (Fdelete_overlay): Do nothing if overlay already deleted.
Richard M. Stallman <rms@gnu.org>
parents: 3481
diff changeset
2891
78b4e6241f85 (Fdelete_overlay): Do nothing if overlay already deleted.
Richard M. Stallman <rms@gnu.org>
parents: 3481
diff changeset
2892 specbind (Qinhibit_quit, Qt);
2508
3aa2f3b35353 * buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents: 2486
diff changeset
2893
3aa2f3b35353 * buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents: 2486
diff changeset
2894 b->overlays_before = Fdelq (overlay, b->overlays_before);
3aa2f3b35353 * buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents: 2486
diff changeset
2895 b->overlays_after = Fdelq (overlay, b->overlays_after);
3aa2f3b35353 * buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents: 2486
diff changeset
2896
16193
6ff2ef91c618 (modify_overlay): Renamed from redisplay_region
Richard M. Stallman <rms@gnu.org>
parents: 16144
diff changeset
2897 modify_overlay (b,
4852
ef44bf38f456 (Fdelete_overlay, Foverlay_put): Use marker_position,
Richard M. Stallman <rms@gnu.org>
parents: 4696
diff changeset
2898 marker_position (OVERLAY_START (overlay)),
ef44bf38f456 (Fdelete_overlay, Foverlay_put): Use marker_position,
Richard M. Stallman <rms@gnu.org>
parents: 4696
diff changeset
2899 marker_position (OVERLAY_END (overlay)));
2722
16db9d1af886 Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents: 2645
diff changeset
2900
2791
4f234fbfb02c * buffer.c (Fmove_overlay): If the overlay is in no buffer and the
Jim Blandy <jimb@redhat.com>
parents: 2787
diff changeset
2901 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
2902 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
2903
3533
78b4e6241f85 (Fdelete_overlay): Do nothing if overlay already deleted.
Richard M. Stallman <rms@gnu.org>
parents: 3481
diff changeset
2904 return unbind_to (count, Qnil);
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
2905 }
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
2906
2787
995c6e665599 * buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents: 2776
diff changeset
2907 /* Overlay dissection functions. */
995c6e665599 * buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents: 2776
diff changeset
2908
995c6e665599 * buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents: 2776
diff changeset
2909 DEFUN ("overlay-start", Foverlay_start, Soverlay_start, 1, 1, 0,
995c6e665599 * buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents: 2776
diff changeset
2910 "Return the position at which OVERLAY starts.")
995c6e665599 * buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents: 2776
diff changeset
2911 (overlay)
995c6e665599 * buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents: 2776
diff changeset
2912 Lisp_Object overlay;
995c6e665599 * buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents: 2776
diff changeset
2913 {
995c6e665599 * buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents: 2776
diff changeset
2914 CHECK_OVERLAY (overlay, 0);
995c6e665599 * buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents: 2776
diff changeset
2915
995c6e665599 * buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents: 2776
diff changeset
2916 return (Fmarker_position (OVERLAY_START (overlay)));
995c6e665599 * buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents: 2776
diff changeset
2917 }
995c6e665599 * buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents: 2776
diff changeset
2918
995c6e665599 * buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents: 2776
diff changeset
2919 DEFUN ("overlay-end", Foverlay_end, Soverlay_end, 1, 1, 0,
995c6e665599 * buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents: 2776
diff changeset
2920 "Return the position at which OVERLAY ends.")
995c6e665599 * buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents: 2776
diff changeset
2921 (overlay)
995c6e665599 * buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents: 2776
diff changeset
2922 Lisp_Object overlay;
995c6e665599 * buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents: 2776
diff changeset
2923 {
995c6e665599 * buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents: 2776
diff changeset
2924 CHECK_OVERLAY (overlay, 0);
995c6e665599 * buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents: 2776
diff changeset
2925
995c6e665599 * buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents: 2776
diff changeset
2926 return (Fmarker_position (OVERLAY_END (overlay)));
995c6e665599 * buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents: 2776
diff changeset
2927 }
995c6e665599 * buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents: 2776
diff changeset
2928
995c6e665599 * buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents: 2776
diff changeset
2929 DEFUN ("overlay-buffer", Foverlay_buffer, Soverlay_buffer, 1, 1, 0,
995c6e665599 * buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents: 2776
diff changeset
2930 "Return the buffer OVERLAY belongs to.")
995c6e665599 * buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents: 2776
diff changeset
2931 (overlay)
995c6e665599 * buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents: 2776
diff changeset
2932 Lisp_Object overlay;
995c6e665599 * buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents: 2776
diff changeset
2933 {
995c6e665599 * buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents: 2776
diff changeset
2934 CHECK_OVERLAY (overlay, 0);
995c6e665599 * buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents: 2776
diff changeset
2935
995c6e665599 * buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents: 2776
diff changeset
2936 return Fmarker_buffer (OVERLAY_START (overlay));
995c6e665599 * buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents: 2776
diff changeset
2937 }
995c6e665599 * buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents: 2776
diff changeset
2938
995c6e665599 * buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents: 2776
diff changeset
2939 DEFUN ("overlay-properties", Foverlay_properties, Soverlay_properties, 1, 1, 0,
995c6e665599 * buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents: 2776
diff changeset
2940 "Return a list of the properties on OVERLAY.\n\
995c6e665599 * buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents: 2776
diff changeset
2941 This is a copy of OVERLAY's plist; modifying its conses has no effect on\n\
995c6e665599 * buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents: 2776
diff changeset
2942 OVERLAY.")
995c6e665599 * buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents: 2776
diff changeset
2943 (overlay)
995c6e665599 * buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents: 2776
diff changeset
2944 Lisp_Object overlay;
995c6e665599 * buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents: 2776
diff changeset
2945 {
995c6e665599 * buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents: 2776
diff changeset
2946 CHECK_OVERLAY (overlay, 0);
995c6e665599 * buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents: 2776
diff changeset
2947
9922
f653d8aac66a (Fmake_overlay, Foverlay_properties, Foverlay_get, Foverlay_put): Use new
Karl Heuer <kwzh@gnu.org>
parents: 9920
diff changeset
2948 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
2949 }
995c6e665599 * buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents: 2776
diff changeset
2950
995c6e665599 * buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents: 2776
diff changeset
2951
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
2952 DEFUN ("overlays-at", Foverlays_at, Soverlays_at, 1, 1, 0,
3591
507f64624555 Apply typo patches from Paul Eggert.
Jim Blandy <jimb@redhat.com>
parents: 3533
diff changeset
2953 "Return a list of the overlays that contain position POS.")
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
2954 (pos)
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
2955 Lisp_Object pos;
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
2956 {
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
2957 int noverlays;
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
2958 Lisp_Object *overlay_vec;
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
2959 int len;
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
2960 Lisp_Object result;
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
2961
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
2962 CHECK_NUMBER_COERCE_MARKER (pos, 0);
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
2963
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
2964 len = 10;
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
2965 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
2966
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
2967 /* 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
2968 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
2969 noverlays = overlays_at (XINT (pos), 1, &overlay_vec, &len,
f892e7cb7f51 (Foverlays_at, Fnext_overlay_change): Don't use NULL.
Richard M. Stallman <rms@gnu.org>
parents: 11414
diff changeset
2970 (int *) 0, (int *) 0);
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
2971
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
2972 /* Make a list of them all. */
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
2973 result = Flist (noverlays, overlay_vec);
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
2974
2439
b6c62e4abf59 Put interrupt input blocking in a separate file from xterm.h.
Jim Blandy <jimb@redhat.com>
parents: 2389
diff changeset
2975 xfree (overlay_vec);
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
2976 return result;
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
2977 }
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
2978
12382
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
2979 DEFUN ("overlays-in", Foverlays_in, Soverlays_in, 2, 2, 0,
12488
71aa23be0228 (overlays_in): Don't count empty overlays at END.
Richard M. Stallman <rms@gnu.org>
parents: 12382
diff changeset
2980 "Return a list of the overlays that overlap the region BEG ... END.\n\
71aa23be0228 (overlays_in): Don't count empty overlays at END.
Richard M. Stallman <rms@gnu.org>
parents: 12382
diff changeset
2981 Overlap means that at least one character is contained within the overlay\n\
71aa23be0228 (overlays_in): Don't count empty overlays at END.
Richard M. Stallman <rms@gnu.org>
parents: 12382
diff changeset
2982 and also contained within the specified region.\n\
71aa23be0228 (overlays_in): Don't count empty overlays at END.
Richard M. Stallman <rms@gnu.org>
parents: 12382
diff changeset
2983 Empty overlays are included in the result if they are located at BEG\n\
71aa23be0228 (overlays_in): Don't count empty overlays at END.
Richard M. Stallman <rms@gnu.org>
parents: 12382
diff changeset
2984 or between BEG and END.")
12382
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
2985 (beg, end)
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
2986 Lisp_Object beg, end;
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
2987 {
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
2988 int noverlays;
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
2989 Lisp_Object *overlay_vec;
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
2990 int len;
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
2991 Lisp_Object result;
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
2992
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
2993 CHECK_NUMBER_COERCE_MARKER (beg, 0);
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
2994 CHECK_NUMBER_COERCE_MARKER (end, 0);
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
2995
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
2996 len = 10;
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
2997 overlay_vec = (Lisp_Object *) xmalloc (len * sizeof (Lisp_Object));
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
2998
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
2999 /* 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
3000 Store the length in len. */
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
3001 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
3002 (int *) 0, (int *) 0);
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
3003
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
3004 /* Make a list of them all. */
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
3005 result = Flist (noverlays, overlay_vec);
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
3006
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
3007 xfree (overlay_vec);
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
3008 return result;
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
3009 }
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
3010
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3011 DEFUN ("next-overlay-change", Fnext_overlay_change, Snext_overlay_change,
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3012 1, 1, 0,
7492
4ba64e05dad6 (Foverlay_lists): Doc fix.
Karl Heuer <kwzh@gnu.org>
parents: 7455
diff changeset
3013 "Return the next position after POS where an overlay starts or ends.\n\
4ba64e05dad6 (Foverlay_lists): Doc fix.
Karl Heuer <kwzh@gnu.org>
parents: 7455
diff changeset
3014 If there are no more overlay boundaries after POS, return (point-max).")
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3015 (pos)
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3016 Lisp_Object pos;
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3017 {
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3018 int noverlays;
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3019 int endpos;
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3020 Lisp_Object *overlay_vec;
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3021 int len;
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3022 int i;
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3023
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3024 CHECK_NUMBER_COERCE_MARKER (pos, 0);
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3025
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3026 len = 10;
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3027 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
3028
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3029 /* 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
3030 Store the length in len.
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3031 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
3032 noverlays = overlays_at (XINT (pos), 1, &overlay_vec, &len,
f892e7cb7f51 (Foverlays_at, Fnext_overlay_change): Don't use NULL.
Richard M. Stallman <rms@gnu.org>
parents: 11414
diff changeset
3033 &endpos, (int *) 0);
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3034
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3035 /* If any of these overlays ends before endpos,
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3036 use its ending point instead. */
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3037 for (i = 0; i < noverlays; i++)
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3038 {
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3039 Lisp_Object oend;
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3040 int oendpos;
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3041
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3042 oend = OVERLAY_END (overlay_vec[i]);
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3043 oendpos = OVERLAY_POSITION (oend);
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3044 if (oendpos < endpos)
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3045 endpos = oendpos;
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3046 }
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3047
2439
b6c62e4abf59 Put interrupt input blocking in a separate file from xterm.h.
Jim Blandy <jimb@redhat.com>
parents: 2389
diff changeset
3048 xfree (overlay_vec);
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3049 return make_number (endpos);
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3050 }
8967
80b92977ed08 (overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents: 8924
diff changeset
3051
80b92977ed08 (overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents: 8924
diff changeset
3052 DEFUN ("previous-overlay-change", Fprevious_overlay_change,
80b92977ed08 (overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents: 8924
diff changeset
3053 Sprevious_overlay_change, 1, 1, 0,
80b92977ed08 (overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents: 8924
diff changeset
3054 "Return the previous position before POS where an overlay starts or ends.\n\
12214
c6ee462394fe (Fprevious_overlay_change): Check for overlays that end at POS.
Richard M. Stallman <rms@gnu.org>
parents: 12110
diff changeset
3055 If there are no more overlay boundaries before POS, return (point-min).")
8967
80b92977ed08 (overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents: 8924
diff changeset
3056 (pos)
80b92977ed08 (overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents: 8924
diff changeset
3057 Lisp_Object pos;
80b92977ed08 (overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents: 8924
diff changeset
3058 {
80b92977ed08 (overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents: 8924
diff changeset
3059 int noverlays;
80b92977ed08 (overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents: 8924
diff changeset
3060 int prevpos;
80b92977ed08 (overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents: 8924
diff changeset
3061 Lisp_Object *overlay_vec;
80b92977ed08 (overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents: 8924
diff changeset
3062 int len;
80b92977ed08 (overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents: 8924
diff changeset
3063 int i;
12214
c6ee462394fe (Fprevious_overlay_change): Check for overlays that end at POS.
Richard M. Stallman <rms@gnu.org>
parents: 12110
diff changeset
3064 Lisp_Object tail;
8967
80b92977ed08 (overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents: 8924
diff changeset
3065
80b92977ed08 (overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents: 8924
diff changeset
3066 CHECK_NUMBER_COERCE_MARKER (pos, 0);
80b92977ed08 (overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents: 8924
diff changeset
3067
80b92977ed08 (overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents: 8924
diff changeset
3068 len = 10;
80b92977ed08 (overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents: 8924
diff changeset
3069 overlay_vec = (Lisp_Object *) xmalloc (len * sizeof (Lisp_Object));
80b92977ed08 (overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents: 8924
diff changeset
3070
12214
c6ee462394fe (Fprevious_overlay_change): Check for overlays that end at POS.
Richard M. Stallman <rms@gnu.org>
parents: 12110
diff changeset
3071 /* 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
3072 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
3073 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
3074 return pos;
c6ee462394fe (Fprevious_overlay_change): Check for overlays that end at POS.
Richard M. Stallman <rms@gnu.org>
parents: 12110
diff changeset
3075
8967
80b92977ed08 (overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents: 8924
diff changeset
3076 /* 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
3077 Store the length in len.
80b92977ed08 (overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents: 8924
diff changeset
3078 prevpos gets the position of an overlay end. */
11418
f892e7cb7f51 (Foverlays_at, Fnext_overlay_change): Don't use NULL.
Richard M. Stallman <rms@gnu.org>
parents: 11414
diff changeset
3079 noverlays = overlays_at (XINT (pos), 1, &overlay_vec, &len,
f892e7cb7f51 (Foverlays_at, Fnext_overlay_change): Don't use NULL.
Richard M. Stallman <rms@gnu.org>
parents: 11414
diff changeset
3080 (int *) 0, &prevpos);
8967
80b92977ed08 (overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents: 8924
diff changeset
3081
12214
c6ee462394fe (Fprevious_overlay_change): Check for overlays that end at POS.
Richard M. Stallman <rms@gnu.org>
parents: 12110
diff changeset
3082 /* If any of these overlays starts after prevpos,
8967
80b92977ed08 (overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents: 8924
diff changeset
3083 maybe use its starting point instead. */
80b92977ed08 (overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents: 8924
diff changeset
3084 for (i = 0; i < noverlays; i++)
80b92977ed08 (overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents: 8924
diff changeset
3085 {
80b92977ed08 (overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents: 8924
diff changeset
3086 Lisp_Object ostart;
80b92977ed08 (overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents: 8924
diff changeset
3087 int ostartpos;
80b92977ed08 (overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents: 8924
diff changeset
3088
80b92977ed08 (overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents: 8924
diff changeset
3089 ostart = OVERLAY_START (overlay_vec[i]);
80b92977ed08 (overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents: 8924
diff changeset
3090 ostartpos = OVERLAY_POSITION (ostart);
80b92977ed08 (overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents: 8924
diff changeset
3091 if (ostartpos > prevpos && ostartpos < XINT (pos))
80b92977ed08 (overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents: 8924
diff changeset
3092 prevpos = ostartpos;
80b92977ed08 (overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents: 8924
diff changeset
3093 }
80b92977ed08 (overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents: 8924
diff changeset
3094
12214
c6ee462394fe (Fprevious_overlay_change): Check for overlays that end at POS.
Richard M. Stallman <rms@gnu.org>
parents: 12110
diff changeset
3095 /* If any overlay ends at pos, consider its starting point too. */
c6ee462394fe (Fprevious_overlay_change): Check for overlays that end at POS.
Richard M. Stallman <rms@gnu.org>
parents: 12110
diff changeset
3096 for (tail = current_buffer->overlays_before;
c6ee462394fe (Fprevious_overlay_change): Check for overlays that end at POS.
Richard M. Stallman <rms@gnu.org>
parents: 12110
diff changeset
3097 GC_CONSP (tail);
c6ee462394fe (Fprevious_overlay_change): Check for overlays that end at POS.
Richard M. Stallman <rms@gnu.org>
parents: 12110
diff changeset
3098 tail = XCONS (tail)->cdr)
c6ee462394fe (Fprevious_overlay_change): Check for overlays that end at POS.
Richard M. Stallman <rms@gnu.org>
parents: 12110
diff changeset
3099 {
c6ee462394fe (Fprevious_overlay_change): Check for overlays that end at POS.
Richard M. Stallman <rms@gnu.org>
parents: 12110
diff changeset
3100 Lisp_Object overlay, ostart;
c6ee462394fe (Fprevious_overlay_change): Check for overlays that end at POS.
Richard M. Stallman <rms@gnu.org>
parents: 12110
diff changeset
3101 int ostartpos;
c6ee462394fe (Fprevious_overlay_change): Check for overlays that end at POS.
Richard M. Stallman <rms@gnu.org>
parents: 12110
diff changeset
3102
c6ee462394fe (Fprevious_overlay_change): Check for overlays that end at POS.
Richard M. Stallman <rms@gnu.org>
parents: 12110
diff changeset
3103 overlay = XCONS (tail)->car;
c6ee462394fe (Fprevious_overlay_change): Check for overlays that end at POS.
Richard M. Stallman <rms@gnu.org>
parents: 12110
diff changeset
3104
c6ee462394fe (Fprevious_overlay_change): Check for overlays that end at POS.
Richard M. Stallman <rms@gnu.org>
parents: 12110
diff changeset
3105 ostart = OVERLAY_START (overlay);
c6ee462394fe (Fprevious_overlay_change): Check for overlays that end at POS.
Richard M. Stallman <rms@gnu.org>
parents: 12110
diff changeset
3106 ostartpos = OVERLAY_POSITION (ostart);
c6ee462394fe (Fprevious_overlay_change): Check for overlays that end at POS.
Richard M. Stallman <rms@gnu.org>
parents: 12110
diff changeset
3107 if (ostartpos > prevpos && ostartpos < XINT (pos))
c6ee462394fe (Fprevious_overlay_change): Check for overlays that end at POS.
Richard M. Stallman <rms@gnu.org>
parents: 12110
diff changeset
3108 prevpos = ostartpos;
c6ee462394fe (Fprevious_overlay_change): Check for overlays that end at POS.
Richard M. Stallman <rms@gnu.org>
parents: 12110
diff changeset
3109 }
c6ee462394fe (Fprevious_overlay_change): Check for overlays that end at POS.
Richard M. Stallman <rms@gnu.org>
parents: 12110
diff changeset
3110
8967
80b92977ed08 (overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents: 8924
diff changeset
3111 xfree (overlay_vec);
80b92977ed08 (overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents: 8924
diff changeset
3112 return make_number (prevpos);
80b92977ed08 (overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents: 8924
diff changeset
3113 }
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3114
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3115 /* These functions are for debugging overlays. */
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3116
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3117 DEFUN ("overlay-lists", Foverlay_lists, Soverlay_lists, 0, 0, 0,
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3118 "Return a pair of lists giving all the overlays of the current buffer.\n\
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3119 The car has all the overlays before the overlay center;\n\
7492
4ba64e05dad6 (Foverlay_lists): Doc fix.
Karl Heuer <kwzh@gnu.org>
parents: 7455
diff changeset
3120 the cdr has all the overlays after the overlay center.\n\
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3121 Recentering overlays moves overlays between these lists.\n\
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3122 The lists you get are copies, so that changing them has no effect.\n\
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3123 However, the overlays you get are the real objects that the buffer uses.")
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3124 ()
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3125 {
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3126 Lisp_Object before, after;
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3127 before = current_buffer->overlays_before;
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3128 if (CONSP (before))
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3129 before = Fcopy_sequence (before);
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3130 after = current_buffer->overlays_after;
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3131 if (CONSP (after))
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3132 after = Fcopy_sequence (after);
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3133
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3134 return Fcons (before, after);
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3135 }
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3136
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3137 DEFUN ("overlay-recenter", Foverlay_recenter, Soverlay_recenter, 1, 1, 0,
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3138 "Recenter the overlays of the current buffer around position POS.")
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3139 (pos)
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3140 Lisp_Object pos;
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3141 {
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3142 CHECK_NUMBER_COERCE_MARKER (pos, 0);
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3143
2508
3aa2f3b35353 * buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents: 2486
diff changeset
3144 recenter_overlay_lists (current_buffer, XINT (pos));
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3145 return Qnil;
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3146 }
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3147
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3148 DEFUN ("overlay-get", Foverlay_get, Soverlay_get, 2, 2, 0,
14060
b62397f49a24 (Fmake_indirect_buffer, Fset_buffer_major_mode, Fpop_to_buffer,
Erik Naggum <erik@naggum.no>
parents: 13922
diff changeset
3149 "Get the property of overlay OVERLAY with property name PROP.")
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3150 (overlay, prop)
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3151 Lisp_Object overlay, prop;
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3152 {
9211
c7bfa0da167b (Foverlay_get): Handle `category' property on overlay.
Richard M. Stallman <rms@gnu.org>
parents: 9146
diff changeset
3153 Lisp_Object plist, fallback;
2776
8bf3bb4c20dd * lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents: 2722
diff changeset
3154
8bf3bb4c20dd * lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents: 2722
diff changeset
3155 CHECK_OVERLAY (overlay, 0);
8bf3bb4c20dd * lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents: 2722
diff changeset
3156
9211
c7bfa0da167b (Foverlay_get): Handle `category' property on overlay.
Richard M. Stallman <rms@gnu.org>
parents: 9146
diff changeset
3157 fallback = Qnil;
c7bfa0da167b (Foverlay_get): Handle `category' property on overlay.
Richard M. Stallman <rms@gnu.org>
parents: 9146
diff changeset
3158
9922
f653d8aac66a (Fmake_overlay, Foverlay_properties, Foverlay_get, Foverlay_put): Use new
Karl Heuer <kwzh@gnu.org>
parents: 9920
diff changeset
3159 for (plist = XOVERLAY (overlay)->plist;
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3160 CONSP (plist) && CONSP (XCONS (plist)->cdr);
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3161 plist = XCONS (XCONS (plist)->cdr)->cdr)
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3162 {
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3163 if (EQ (XCONS (plist)->car, prop))
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3164 return XCONS (XCONS (plist)->cdr)->car;
9211
c7bfa0da167b (Foverlay_get): Handle `category' property on overlay.
Richard M. Stallman <rms@gnu.org>
parents: 9146
diff changeset
3165 else if (EQ (XCONS (plist)->car, Qcategory))
c7bfa0da167b (Foverlay_get): Handle `category' property on overlay.
Richard M. Stallman <rms@gnu.org>
parents: 9146
diff changeset
3166 {
c7bfa0da167b (Foverlay_get): Handle `category' property on overlay.
Richard M. Stallman <rms@gnu.org>
parents: 9146
diff changeset
3167 Lisp_Object tem;
c7bfa0da167b (Foverlay_get): Handle `category' property on overlay.
Richard M. Stallman <rms@gnu.org>
parents: 9146
diff changeset
3168 tem = Fcar (Fcdr (plist));
c7bfa0da167b (Foverlay_get): Handle `category' property on overlay.
Richard M. Stallman <rms@gnu.org>
parents: 9146
diff changeset
3169 if (SYMBOLP (tem))
c7bfa0da167b (Foverlay_get): Handle `category' property on overlay.
Richard M. Stallman <rms@gnu.org>
parents: 9146
diff changeset
3170 fallback = Fget (tem, prop);
c7bfa0da167b (Foverlay_get): Handle `category' property on overlay.
Richard M. Stallman <rms@gnu.org>
parents: 9146
diff changeset
3171 }
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3172 }
2776
8bf3bb4c20dd * lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents: 2722
diff changeset
3173
9211
c7bfa0da167b (Foverlay_get): Handle `category' property on overlay.
Richard M. Stallman <rms@gnu.org>
parents: 9146
diff changeset
3174 return fallback;
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3175 }
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3176
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3177 DEFUN ("overlay-put", Foverlay_put, Soverlay_put, 3, 3, 0,
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3178 "Set one property of overlay OVERLAY: give property PROP value VALUE.")
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3179 (overlay, prop, value)
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3180 Lisp_Object overlay, prop, value;
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3181 {
9922
f653d8aac66a (Fmake_overlay, Foverlay_properties, Foverlay_get, Foverlay_put): Use new
Karl Heuer <kwzh@gnu.org>
parents: 9920
diff changeset
3182 Lisp_Object tail, buffer;
8839
41981db9ad8e (Qevaporate): New symbol.
Karl Heuer <kwzh@gnu.org>
parents: 8818
diff changeset
3183 int changed;
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3184
2776
8bf3bb4c20dd * lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents: 2722
diff changeset
3185 CHECK_OVERLAY (overlay, 0);
2722
16db9d1af886 Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents: 2645
diff changeset
3186
8062
ad595e4e165c (send_process): Major rewrite.
Richard M. Stallman <rms@gnu.org>
parents: 8035
diff changeset
3187 buffer = Fmarker_buffer (OVERLAY_START (overlay));
ad595e4e165c (send_process): Major rewrite.
Richard M. Stallman <rms@gnu.org>
parents: 8035
diff changeset
3188
9922
f653d8aac66a (Fmake_overlay, Foverlay_properties, Foverlay_get, Foverlay_put): Use new
Karl Heuer <kwzh@gnu.org>
parents: 9920
diff changeset
3189 for (tail = XOVERLAY (overlay)->plist;
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3190 CONSP (tail) && CONSP (XCONS (tail)->cdr);
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3191 tail = XCONS (XCONS (tail)->cdr)->cdr)
8062
ad595e4e165c (send_process): Major rewrite.
Richard M. Stallman <rms@gnu.org>
parents: 8035
diff changeset
3192 if (EQ (XCONS (tail)->car, prop))
ad595e4e165c (send_process): Major rewrite.
Richard M. Stallman <rms@gnu.org>
parents: 8035
diff changeset
3193 {
8839
41981db9ad8e (Qevaporate): New symbol.
Karl Heuer <kwzh@gnu.org>
parents: 8818
diff changeset
3194 changed = !EQ (XCONS (XCONS (tail)->cdr)->car, value);
41981db9ad8e (Qevaporate): New symbol.
Karl Heuer <kwzh@gnu.org>
parents: 8818
diff changeset
3195 XCONS (XCONS (tail)->cdr)->car = value;
41981db9ad8e (Qevaporate): New symbol.
Karl Heuer <kwzh@gnu.org>
parents: 8818
diff changeset
3196 goto found;
8062
ad595e4e165c (send_process): Major rewrite.
Richard M. Stallman <rms@gnu.org>
parents: 8035
diff changeset
3197 }
8839
41981db9ad8e (Qevaporate): New symbol.
Karl Heuer <kwzh@gnu.org>
parents: 8818
diff changeset
3198 /* It wasn't in the list, so add it to the front. */
41981db9ad8e (Qevaporate): New symbol.
Karl Heuer <kwzh@gnu.org>
parents: 8818
diff changeset
3199 changed = !NILP (value);
9922
f653d8aac66a (Fmake_overlay, Foverlay_properties, Foverlay_get, Foverlay_put): Use new
Karl Heuer <kwzh@gnu.org>
parents: 9920
diff changeset
3200 XOVERLAY (overlay)->plist
f653d8aac66a (Fmake_overlay, Foverlay_properties, Foverlay_get, Foverlay_put): Use new
Karl Heuer <kwzh@gnu.org>
parents: 9920
diff changeset
3201 = Fcons (prop, Fcons (value, XOVERLAY (overlay)->plist));
8839
41981db9ad8e (Qevaporate): New symbol.
Karl Heuer <kwzh@gnu.org>
parents: 8818
diff changeset
3202 found:
41981db9ad8e (Qevaporate): New symbol.
Karl Heuer <kwzh@gnu.org>
parents: 8818
diff changeset
3203 if (! NILP (buffer))
41981db9ad8e (Qevaporate): New symbol.
Karl Heuer <kwzh@gnu.org>
parents: 8818
diff changeset
3204 {
41981db9ad8e (Qevaporate): New symbol.
Karl Heuer <kwzh@gnu.org>
parents: 8818
diff changeset
3205 if (changed)
16193
6ff2ef91c618 (modify_overlay): Renamed from redisplay_region
Richard M. Stallman <rms@gnu.org>
parents: 16144
diff changeset
3206 modify_overlay (XBUFFER (buffer),
8839
41981db9ad8e (Qevaporate): New symbol.
Karl Heuer <kwzh@gnu.org>
parents: 8818
diff changeset
3207 marker_position (OVERLAY_START (overlay)),
41981db9ad8e (Qevaporate): New symbol.
Karl Heuer <kwzh@gnu.org>
parents: 8818
diff changeset
3208 marker_position (OVERLAY_END (overlay)));
41981db9ad8e (Qevaporate): New symbol.
Karl Heuer <kwzh@gnu.org>
parents: 8818
diff changeset
3209 if (EQ (prop, Qevaporate) && ! NILP (value)
41981db9ad8e (Qevaporate): New symbol.
Karl Heuer <kwzh@gnu.org>
parents: 8818
diff changeset
3210 && (OVERLAY_POSITION (OVERLAY_START (overlay))
41981db9ad8e (Qevaporate): New symbol.
Karl Heuer <kwzh@gnu.org>
parents: 8818
diff changeset
3211 == OVERLAY_POSITION (OVERLAY_END (overlay))))
41981db9ad8e (Qevaporate): New symbol.
Karl Heuer <kwzh@gnu.org>
parents: 8818
diff changeset
3212 Fdelete_overlay (overlay);
41981db9ad8e (Qevaporate): New symbol.
Karl Heuer <kwzh@gnu.org>
parents: 8818
diff changeset
3213 }
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3214 return value;
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3215 }
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3216
12538
5920994b14c2 (last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 12488
diff changeset
3217 /* Subroutine of report_overlay_modification. */
5920994b14c2 (last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 12488
diff changeset
3218
5920994b14c2 (last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 12488
diff changeset
3219 /* Lisp vector holding overlay hook functions to call.
5920994b14c2 (last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 12488
diff changeset
3220 Vector elements come in pairs.
5920994b14c2 (last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 12488
diff changeset
3221 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
3222 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
3223
5920994b14c2 (last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 12488
diff changeset
3224 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
3225 as we call overlay hook functions.
5920994b14c2 (last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 12488
diff changeset
3226 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
3227 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
3228 static Lisp_Object last_overlay_modification_hooks;
5920994b14c2 (last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 12488
diff changeset
3229
5920994b14c2 (last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 12488
diff changeset
3230 /* 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
3231 static int last_overlay_modification_hooks_used;
5920994b14c2 (last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 12488
diff changeset
3232
5920994b14c2 (last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 12488
diff changeset
3233 /* Add one functionlist/overlay pair
5920994b14c2 (last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 12488
diff changeset
3234 to the end of last_overlay_modification_hooks. */
5920994b14c2 (last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 12488
diff changeset
3235
5920994b14c2 (last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 12488
diff changeset
3236 static void
5920994b14c2 (last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 12488
diff changeset
3237 add_overlay_mod_hooklist (functionlist, overlay)
5920994b14c2 (last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 12488
diff changeset
3238 Lisp_Object functionlist, overlay;
5920994b14c2 (last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 12488
diff changeset
3239 {
5920994b14c2 (last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 12488
diff changeset
3240 int oldsize = XVECTOR (last_overlay_modification_hooks)->size;
5920994b14c2 (last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 12488
diff changeset
3241
5920994b14c2 (last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 12488
diff changeset
3242 if (last_overlay_modification_hooks_used == oldsize)
5920994b14c2 (last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 12488
diff changeset
3243 {
5920994b14c2 (last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 12488
diff changeset
3244 Lisp_Object old;
5920994b14c2 (last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 12488
diff changeset
3245 old = last_overlay_modification_hooks;
5920994b14c2 (last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 12488
diff changeset
3246 last_overlay_modification_hooks
5920994b14c2 (last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 12488
diff changeset
3247 = 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
3248 bcopy (XVECTOR (old)->contents,
a46a40f1c30c (add_overlay_mod_hooklist): Fix call to bcopy.
Richard M. Stallman <rms@gnu.org>
parents: 15032
diff changeset
3249 XVECTOR (last_overlay_modification_hooks)->contents,
12538
5920994b14c2 (last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 12488
diff changeset
3250 sizeof (Lisp_Object) * oldsize);
5920994b14c2 (last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 12488
diff changeset
3251 }
5920994b14c2 (last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 12488
diff changeset
3252 XVECTOR (last_overlay_modification_hooks)->contents[last_overlay_modification_hooks_used++] = functionlist;
5920994b14c2 (last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 12488
diff changeset
3253 XVECTOR (last_overlay_modification_hooks)->contents[last_overlay_modification_hooks_used++] = overlay;
5920994b14c2 (last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 12488
diff changeset
3254 }
5920994b14c2 (last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 12488
diff changeset
3255
4077
a860278e3ab3 (verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents: 3884
diff changeset
3256 /* Run the modification-hooks of overlays that include
a860278e3ab3 (verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents: 3884
diff changeset
3257 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
3258 If this change is an insertion, also
5920994b14c2 (last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 12488
diff changeset
3259 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
3260 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
3261
24032289479c (report_overlay_modification): Renamed from verify_overlay_modification.
Richard M. Stallman <rms@gnu.org>
parents: 10143
diff changeset
3262 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
3263 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
3264
12538
5920994b14c2 (last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 12488
diff changeset
3265 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
3266 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
3267 the position after the inserted new text,
5920994b14c2 (last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 12488
diff changeset
3268 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
3269
a860278e3ab3 (verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents: 3884
diff changeset
3270 void
10146
24032289479c (report_overlay_modification): Renamed from verify_overlay_modification.
Richard M. Stallman <rms@gnu.org>
parents: 10143
diff changeset
3271 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
3272 Lisp_Object start, end;
10146
24032289479c (report_overlay_modification): Renamed from verify_overlay_modification.
Richard M. Stallman <rms@gnu.org>
parents: 10143
diff changeset
3273 int after;
24032289479c (report_overlay_modification): Renamed from verify_overlay_modification.
Richard M. Stallman <rms@gnu.org>
parents: 10143
diff changeset
3274 Lisp_Object arg1, arg2, arg3;
4077
a860278e3ab3 (verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents: 3884
diff changeset
3275 {
a860278e3ab3 (verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents: 3884
diff changeset
3276 Lisp_Object prop, overlay, tail;
12538
5920994b14c2 (last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 12488
diff changeset
3277 /* 1 if this change is an insertion. */
5920994b14c2 (last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 12488
diff changeset
3278 int insertion = (after ? XFASTINT (arg3) == 0 : EQ (start, end));
7670
b3be53811505 (verify_overlay_modification): GCPRO tail and overlay.
Richard M. Stallman <rms@gnu.org>
parents: 7520
diff changeset
3279 int tail_copied;
10146
24032289479c (report_overlay_modification): Renamed from verify_overlay_modification.
Richard M. Stallman <rms@gnu.org>
parents: 10143
diff changeset
3280 struct gcpro gcpro1, gcpro2, gcpro3, gcpro4, gcpro5;
7670
b3be53811505 (verify_overlay_modification): GCPRO tail and overlay.
Richard M. Stallman <rms@gnu.org>
parents: 7520
diff changeset
3281
b3be53811505 (verify_overlay_modification): GCPRO tail and overlay.
Richard M. Stallman <rms@gnu.org>
parents: 7520
diff changeset
3282 overlay = Qnil;
b3be53811505 (verify_overlay_modification): GCPRO tail and overlay.
Richard M. Stallman <rms@gnu.org>
parents: 7520
diff changeset
3283 tail = Qnil;
10146
24032289479c (report_overlay_modification): Renamed from verify_overlay_modification.
Richard M. Stallman <rms@gnu.org>
parents: 10143
diff changeset
3284 GCPRO5 (overlay, tail, arg1, arg2, arg3);
7670
b3be53811505 (verify_overlay_modification): GCPRO tail and overlay.
Richard M. Stallman <rms@gnu.org>
parents: 7520
diff changeset
3285
12538
5920994b14c2 (last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 12488
diff changeset
3286 if (after)
5920994b14c2 (last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 12488
diff changeset
3287 {
5920994b14c2 (last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 12488
diff changeset
3288 /* Call the functions recorded in last_overlay_modification_hooks
5920994b14c2 (last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 12488
diff changeset
3289 rather than scanning the overlays again.
5920994b14c2 (last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 12488
diff changeset
3290 First copy the vector contents, in case some of these hooks
5920994b14c2 (last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 12488
diff changeset
3291 do subsequent modification of the buffer. */
5920994b14c2 (last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 12488
diff changeset
3292 int size = last_overlay_modification_hooks_used;
5920994b14c2 (last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 12488
diff changeset
3293 Lisp_Object *copy = (Lisp_Object *) alloca (size * sizeof (Lisp_Object));
5920994b14c2 (last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 12488
diff changeset
3294 int i;
5920994b14c2 (last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 12488
diff changeset
3295
5920994b14c2 (last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 12488
diff changeset
3296 bcopy (XVECTOR (last_overlay_modification_hooks)->contents,
5920994b14c2 (last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 12488
diff changeset
3297 copy, size * sizeof (Lisp_Object));
5920994b14c2 (last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 12488
diff changeset
3298 gcpro1.var = copy;
5920994b14c2 (last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 12488
diff changeset
3299 gcpro1.nvars = size;
5920994b14c2 (last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 12488
diff changeset
3300
5920994b14c2 (last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 12488
diff changeset
3301 for (i = 0; i < size;)
5920994b14c2 (last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 12488
diff changeset
3302 {
5920994b14c2 (last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 12488
diff changeset
3303 Lisp_Object prop, overlay;
5920994b14c2 (last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 12488
diff changeset
3304 prop = copy[i++];
5920994b14c2 (last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 12488
diff changeset
3305 overlay = copy[i++];
5920994b14c2 (last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 12488
diff changeset
3306 call_overlay_mod_hooks (prop, overlay, after, arg1, arg2, arg3);
5920994b14c2 (last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 12488
diff changeset
3307 }
5920994b14c2 (last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 12488
diff changeset
3308 UNGCPRO;
5920994b14c2 (last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 12488
diff changeset
3309 return;
5920994b14c2 (last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 12488
diff changeset
3310 }
5920994b14c2 (last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 12488
diff changeset
3311
5920994b14c2 (last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 12488
diff changeset
3312 /* We are being called before a change.
5920994b14c2 (last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 12488
diff changeset
3313 Scan the overlays to find the functions to call. */
5920994b14c2 (last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 12488
diff changeset
3314 last_overlay_modification_hooks_used = 0;
7670
b3be53811505 (verify_overlay_modification): GCPRO tail and overlay.
Richard M. Stallman <rms@gnu.org>
parents: 7520
diff changeset
3315 tail_copied = 0;
4077
a860278e3ab3 (verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents: 3884
diff changeset
3316 for (tail = current_buffer->overlays_before;
a860278e3ab3 (verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents: 3884
diff changeset
3317 CONSP (tail);
a860278e3ab3 (verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents: 3884
diff changeset
3318 tail = XCONS (tail)->cdr)
a860278e3ab3 (verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents: 3884
diff changeset
3319 {
a860278e3ab3 (verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents: 3884
diff changeset
3320 int startpos, endpos;
4416
9657ef911049 (Fmove_overlay): Avoid initializer for Lisp_Object vars.
Richard M. Stallman <rms@gnu.org>
parents: 4226
diff changeset
3321 Lisp_Object ostart, oend;
4077
a860278e3ab3 (verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents: 3884
diff changeset
3322
a860278e3ab3 (verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents: 3884
diff changeset
3323 overlay = XCONS (tail)->car;
a860278e3ab3 (verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents: 3884
diff changeset
3324
a860278e3ab3 (verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents: 3884
diff changeset
3325 ostart = OVERLAY_START (overlay);
a860278e3ab3 (verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents: 3884
diff changeset
3326 oend = OVERLAY_END (overlay);
a860278e3ab3 (verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents: 3884
diff changeset
3327 endpos = OVERLAY_POSITION (oend);
a860278e3ab3 (verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents: 3884
diff changeset
3328 if (XFASTINT (start) > endpos)
a860278e3ab3 (verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents: 3884
diff changeset
3329 break;
a860278e3ab3 (verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents: 3884
diff changeset
3330 startpos = OVERLAY_POSITION (ostart);
12538
5920994b14c2 (last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 12488
diff changeset
3331 if (insertion && (XFASTINT (start) == startpos
5920994b14c2 (last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 12488
diff changeset
3332 || XFASTINT (end) == startpos))
4077
a860278e3ab3 (verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents: 3884
diff changeset
3333 {
a860278e3ab3 (verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents: 3884
diff changeset
3334 prop = Foverlay_get (overlay, Qinsert_in_front_hooks);
6591
60f70854e73f (verify_overlay_modification):
Richard M. Stallman <rms@gnu.org>
parents: 6493
diff changeset
3335 if (!NILP (prop))
60f70854e73f (verify_overlay_modification):
Richard M. Stallman <rms@gnu.org>
parents: 6493
diff changeset
3336 {
60f70854e73f (verify_overlay_modification):
Richard M. Stallman <rms@gnu.org>
parents: 6493
diff changeset
3337 /* Copy TAIL in case the hook recenters the overlay lists. */
7670
b3be53811505 (verify_overlay_modification): GCPRO tail and overlay.
Richard M. Stallman <rms@gnu.org>
parents: 7520
diff changeset
3338 if (!tail_copied)
b3be53811505 (verify_overlay_modification): GCPRO tail and overlay.
Richard M. Stallman <rms@gnu.org>
parents: 7520
diff changeset
3339 tail = Fcopy_sequence (tail);
b3be53811505 (verify_overlay_modification): GCPRO tail and overlay.
Richard M. Stallman <rms@gnu.org>
parents: 7520
diff changeset
3340 tail_copied = 1;
10146
24032289479c (report_overlay_modification): Renamed from verify_overlay_modification.
Richard M. Stallman <rms@gnu.org>
parents: 10143
diff changeset
3341 call_overlay_mod_hooks (prop, overlay, after, arg1, arg2, arg3);
6591
60f70854e73f (verify_overlay_modification):
Richard M. Stallman <rms@gnu.org>
parents: 6493
diff changeset
3342 }
4077
a860278e3ab3 (verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents: 3884
diff changeset
3343 }
12538
5920994b14c2 (last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 12488
diff changeset
3344 if (insertion && (XFASTINT (start) == endpos
5920994b14c2 (last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 12488
diff changeset
3345 || XFASTINT (end) == endpos))
4077
a860278e3ab3 (verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents: 3884
diff changeset
3346 {
a860278e3ab3 (verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents: 3884
diff changeset
3347 prop = Foverlay_get (overlay, Qinsert_behind_hooks);
6591
60f70854e73f (verify_overlay_modification):
Richard M. Stallman <rms@gnu.org>
parents: 6493
diff changeset
3348 if (!NILP (prop))
60f70854e73f (verify_overlay_modification):
Richard M. Stallman <rms@gnu.org>
parents: 6493
diff changeset
3349 {
7670
b3be53811505 (verify_overlay_modification): GCPRO tail and overlay.
Richard M. Stallman <rms@gnu.org>
parents: 7520
diff changeset
3350 if (!tail_copied)
b3be53811505 (verify_overlay_modification): GCPRO tail and overlay.
Richard M. Stallman <rms@gnu.org>
parents: 7520
diff changeset
3351 tail = Fcopy_sequence (tail);
b3be53811505 (verify_overlay_modification): GCPRO tail and overlay.
Richard M. Stallman <rms@gnu.org>
parents: 7520
diff changeset
3352 tail_copied = 1;
10146
24032289479c (report_overlay_modification): Renamed from verify_overlay_modification.
Richard M. Stallman <rms@gnu.org>
parents: 10143
diff changeset
3353 call_overlay_mod_hooks (prop, overlay, after, arg1, arg2, arg3);
6591
60f70854e73f (verify_overlay_modification):
Richard M. Stallman <rms@gnu.org>
parents: 6493
diff changeset
3354 }
4077
a860278e3ab3 (verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents: 3884
diff changeset
3355 }
6675
cf38c5af079d (verify_overlay_modification): Run modification-hooks for any deletion that
Karl Heuer <kwzh@gnu.org>
parents: 6659
diff changeset
3356 /* Test for intersecting intervals. This does the right thing
cf38c5af079d (verify_overlay_modification): Run modification-hooks for any deletion that
Karl Heuer <kwzh@gnu.org>
parents: 6659
diff changeset
3357 for both insertion and deletion. */
cf38c5af079d (verify_overlay_modification): Run modification-hooks for any deletion that
Karl Heuer <kwzh@gnu.org>
parents: 6659
diff changeset
3358 if (XFASTINT (end) > startpos && XFASTINT (start) < endpos)
4077
a860278e3ab3 (verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents: 3884
diff changeset
3359 {
a860278e3ab3 (verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents: 3884
diff changeset
3360 prop = Foverlay_get (overlay, Qmodification_hooks);
6591
60f70854e73f (verify_overlay_modification):
Richard M. Stallman <rms@gnu.org>
parents: 6493
diff changeset
3361 if (!NILP (prop))
60f70854e73f (verify_overlay_modification):
Richard M. Stallman <rms@gnu.org>
parents: 6493
diff changeset
3362 {
7670
b3be53811505 (verify_overlay_modification): GCPRO tail and overlay.
Richard M. Stallman <rms@gnu.org>
parents: 7520
diff changeset
3363 if (!tail_copied)
b3be53811505 (verify_overlay_modification): GCPRO tail and overlay.
Richard M. Stallman <rms@gnu.org>
parents: 7520
diff changeset
3364 tail = Fcopy_sequence (tail);
b3be53811505 (verify_overlay_modification): GCPRO tail and overlay.
Richard M. Stallman <rms@gnu.org>
parents: 7520
diff changeset
3365 tail_copied = 1;
10146
24032289479c (report_overlay_modification): Renamed from verify_overlay_modification.
Richard M. Stallman <rms@gnu.org>
parents: 10143
diff changeset
3366 call_overlay_mod_hooks (prop, overlay, after, arg1, arg2, arg3);
6591
60f70854e73f (verify_overlay_modification):
Richard M. Stallman <rms@gnu.org>
parents: 6493
diff changeset
3367 }
4077
a860278e3ab3 (verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents: 3884
diff changeset
3368 }
a860278e3ab3 (verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents: 3884
diff changeset
3369 }
a860278e3ab3 (verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents: 3884
diff changeset
3370
7670
b3be53811505 (verify_overlay_modification): GCPRO tail and overlay.
Richard M. Stallman <rms@gnu.org>
parents: 7520
diff changeset
3371 tail_copied = 0;
4077
a860278e3ab3 (verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents: 3884
diff changeset
3372 for (tail = current_buffer->overlays_after;
a860278e3ab3 (verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents: 3884
diff changeset
3373 CONSP (tail);
a860278e3ab3 (verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents: 3884
diff changeset
3374 tail = XCONS (tail)->cdr)
a860278e3ab3 (verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents: 3884
diff changeset
3375 {
a860278e3ab3 (verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents: 3884
diff changeset
3376 int startpos, endpos;
4416
9657ef911049 (Fmove_overlay): Avoid initializer for Lisp_Object vars.
Richard M. Stallman <rms@gnu.org>
parents: 4226
diff changeset
3377 Lisp_Object ostart, oend;
4077
a860278e3ab3 (verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents: 3884
diff changeset
3378
a860278e3ab3 (verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents: 3884
diff changeset
3379 overlay = XCONS (tail)->car;
a860278e3ab3 (verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents: 3884
diff changeset
3380
a860278e3ab3 (verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents: 3884
diff changeset
3381 ostart = OVERLAY_START (overlay);
a860278e3ab3 (verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents: 3884
diff changeset
3382 oend = OVERLAY_END (overlay);
a860278e3ab3 (verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents: 3884
diff changeset
3383 startpos = OVERLAY_POSITION (ostart);
4574
503af6aa135b (verify_overlay_modification): initialize endpos.
Richard M. Stallman <rms@gnu.org>
parents: 4416
diff changeset
3384 endpos = OVERLAY_POSITION (oend);
4077
a860278e3ab3 (verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents: 3884
diff changeset
3385 if (XFASTINT (end) < startpos)
a860278e3ab3 (verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents: 3884
diff changeset
3386 break;
12538
5920994b14c2 (last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 12488
diff changeset
3387 if (insertion && (XFASTINT (start) == startpos
5920994b14c2 (last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 12488
diff changeset
3388 || XFASTINT (end) == startpos))
4077
a860278e3ab3 (verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents: 3884
diff changeset
3389 {
a860278e3ab3 (verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents: 3884
diff changeset
3390 prop = Foverlay_get (overlay, Qinsert_in_front_hooks);
6591
60f70854e73f (verify_overlay_modification):
Richard M. Stallman <rms@gnu.org>
parents: 6493
diff changeset
3391 if (!NILP (prop))
60f70854e73f (verify_overlay_modification):
Richard M. Stallman <rms@gnu.org>
parents: 6493
diff changeset
3392 {
7670
b3be53811505 (verify_overlay_modification): GCPRO tail and overlay.
Richard M. Stallman <rms@gnu.org>
parents: 7520
diff changeset
3393 if (!tail_copied)
b3be53811505 (verify_overlay_modification): GCPRO tail and overlay.
Richard M. Stallman <rms@gnu.org>
parents: 7520
diff changeset
3394 tail = Fcopy_sequence (tail);
b3be53811505 (verify_overlay_modification): GCPRO tail and overlay.
Richard M. Stallman <rms@gnu.org>
parents: 7520
diff changeset
3395 tail_copied = 1;
10146
24032289479c (report_overlay_modification): Renamed from verify_overlay_modification.
Richard M. Stallman <rms@gnu.org>
parents: 10143
diff changeset
3396 call_overlay_mod_hooks (prop, overlay, after, arg1, arg2, arg3);
6591
60f70854e73f (verify_overlay_modification):
Richard M. Stallman <rms@gnu.org>
parents: 6493
diff changeset
3397 }
4077
a860278e3ab3 (verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents: 3884
diff changeset
3398 }
12538
5920994b14c2 (last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 12488
diff changeset
3399 if (insertion && (XFASTINT (start) == endpos
5920994b14c2 (last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 12488
diff changeset
3400 || XFASTINT (end) == endpos))
4077
a860278e3ab3 (verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents: 3884
diff changeset
3401 {
a860278e3ab3 (verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents: 3884
diff changeset
3402 prop = Foverlay_get (overlay, Qinsert_behind_hooks);
6591
60f70854e73f (verify_overlay_modification):
Richard M. Stallman <rms@gnu.org>
parents: 6493
diff changeset
3403 if (!NILP (prop))
60f70854e73f (verify_overlay_modification):
Richard M. Stallman <rms@gnu.org>
parents: 6493
diff changeset
3404 {
7670
b3be53811505 (verify_overlay_modification): GCPRO tail and overlay.
Richard M. Stallman <rms@gnu.org>
parents: 7520
diff changeset
3405 if (!tail_copied)
b3be53811505 (verify_overlay_modification): GCPRO tail and overlay.
Richard M. Stallman <rms@gnu.org>
parents: 7520
diff changeset
3406 tail = Fcopy_sequence (tail);
b3be53811505 (verify_overlay_modification): GCPRO tail and overlay.
Richard M. Stallman <rms@gnu.org>
parents: 7520
diff changeset
3407 tail_copied = 1;
10146
24032289479c (report_overlay_modification): Renamed from verify_overlay_modification.
Richard M. Stallman <rms@gnu.org>
parents: 10143
diff changeset
3408 call_overlay_mod_hooks (prop, overlay, after, arg1, arg2, arg3);
6591
60f70854e73f (verify_overlay_modification):
Richard M. Stallman <rms@gnu.org>
parents: 6493
diff changeset
3409 }
4077
a860278e3ab3 (verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents: 3884
diff changeset
3410 }
6675
cf38c5af079d (verify_overlay_modification): Run modification-hooks for any deletion that
Karl Heuer <kwzh@gnu.org>
parents: 6659
diff changeset
3411 /* Test for intersecting intervals. This does the right thing
cf38c5af079d (verify_overlay_modification): Run modification-hooks for any deletion that
Karl Heuer <kwzh@gnu.org>
parents: 6659
diff changeset
3412 for both insertion and deletion. */
cf38c5af079d (verify_overlay_modification): Run modification-hooks for any deletion that
Karl Heuer <kwzh@gnu.org>
parents: 6659
diff changeset
3413 if (XFASTINT (end) > startpos && XFASTINT (start) < endpos)
4077
a860278e3ab3 (verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents: 3884
diff changeset
3414 {
a860278e3ab3 (verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents: 3884
diff changeset
3415 prop = Foverlay_get (overlay, Qmodification_hooks);
6591
60f70854e73f (verify_overlay_modification):
Richard M. Stallman <rms@gnu.org>
parents: 6493
diff changeset
3416 if (!NILP (prop))
60f70854e73f (verify_overlay_modification):
Richard M. Stallman <rms@gnu.org>
parents: 6493
diff changeset
3417 {
7670
b3be53811505 (verify_overlay_modification): GCPRO tail and overlay.
Richard M. Stallman <rms@gnu.org>
parents: 7520
diff changeset
3418 if (!tail_copied)
b3be53811505 (verify_overlay_modification): GCPRO tail and overlay.
Richard M. Stallman <rms@gnu.org>
parents: 7520
diff changeset
3419 tail = Fcopy_sequence (tail);
b3be53811505 (verify_overlay_modification): GCPRO tail and overlay.
Richard M. Stallman <rms@gnu.org>
parents: 7520
diff changeset
3420 tail_copied = 1;
10146
24032289479c (report_overlay_modification): Renamed from verify_overlay_modification.
Richard M. Stallman <rms@gnu.org>
parents: 10143
diff changeset
3421 call_overlay_mod_hooks (prop, overlay, after, arg1, arg2, arg3);
6591
60f70854e73f (verify_overlay_modification):
Richard M. Stallman <rms@gnu.org>
parents: 6493
diff changeset
3422 }
4077
a860278e3ab3 (verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents: 3884
diff changeset
3423 }
a860278e3ab3 (verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents: 3884
diff changeset
3424 }
7670
b3be53811505 (verify_overlay_modification): GCPRO tail and overlay.
Richard M. Stallman <rms@gnu.org>
parents: 7520
diff changeset
3425
b3be53811505 (verify_overlay_modification): GCPRO tail and overlay.
Richard M. Stallman <rms@gnu.org>
parents: 7520
diff changeset
3426 UNGCPRO;
4077
a860278e3ab3 (verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents: 3884
diff changeset
3427 }
a860278e3ab3 (verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents: 3884
diff changeset
3428
a860278e3ab3 (verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents: 3884
diff changeset
3429 static void
10146
24032289479c (report_overlay_modification): Renamed from verify_overlay_modification.
Richard M. Stallman <rms@gnu.org>
parents: 10143
diff changeset
3430 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
3431 Lisp_Object list, overlay;
24032289479c (report_overlay_modification): Renamed from verify_overlay_modification.
Richard M. Stallman <rms@gnu.org>
parents: 10143
diff changeset
3432 int after;
24032289479c (report_overlay_modification): Renamed from verify_overlay_modification.
Richard M. Stallman <rms@gnu.org>
parents: 10143
diff changeset
3433 Lisp_Object arg1, arg2, arg3;
4077
a860278e3ab3 (verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents: 3884
diff changeset
3434 {
10146
24032289479c (report_overlay_modification): Renamed from verify_overlay_modification.
Richard M. Stallman <rms@gnu.org>
parents: 10143
diff changeset
3435 struct gcpro gcpro1, gcpro2, gcpro3, gcpro4;
12538
5920994b14c2 (last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 12488
diff changeset
3436
10146
24032289479c (report_overlay_modification): Renamed from verify_overlay_modification.
Richard M. Stallman <rms@gnu.org>
parents: 10143
diff changeset
3437 GCPRO4 (list, arg1, arg2, arg3);
12538
5920994b14c2 (last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 12488
diff changeset
3438 if (! after)
5920994b14c2 (last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 12488
diff changeset
3439 add_overlay_mod_hooklist (list, overlay);
5920994b14c2 (last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 12488
diff changeset
3440
4077
a860278e3ab3 (verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents: 3884
diff changeset
3441 while (!NILP (list))
a860278e3ab3 (verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents: 3884
diff changeset
3442 {
10146
24032289479c (report_overlay_modification): Renamed from verify_overlay_modification.
Richard M. Stallman <rms@gnu.org>
parents: 10143
diff changeset
3443 if (NILP (arg3))
24032289479c (report_overlay_modification): Renamed from verify_overlay_modification.
Richard M. Stallman <rms@gnu.org>
parents: 10143
diff changeset
3444 call4 (Fcar (list), overlay, after ? Qt : Qnil, arg1, arg2);
24032289479c (report_overlay_modification): Renamed from verify_overlay_modification.
Richard M. Stallman <rms@gnu.org>
parents: 10143
diff changeset
3445 else
24032289479c (report_overlay_modification): Renamed from verify_overlay_modification.
Richard M. Stallman <rms@gnu.org>
parents: 10143
diff changeset
3446 call5 (Fcar (list), overlay, after ? Qt : Qnil, arg1, arg2, arg3);
4077
a860278e3ab3 (verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents: 3884
diff changeset
3447 list = Fcdr (list);
a860278e3ab3 (verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents: 3884
diff changeset
3448 }
a860278e3ab3 (verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents: 3884
diff changeset
3449 UNGCPRO;
a860278e3ab3 (verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents: 3884
diff changeset
3450 }
8839
41981db9ad8e (Qevaporate): New symbol.
Karl Heuer <kwzh@gnu.org>
parents: 8818
diff changeset
3451
41981db9ad8e (Qevaporate): New symbol.
Karl Heuer <kwzh@gnu.org>
parents: 8818
diff changeset
3452 /* Delete any zero-sized overlays at position POS, if the `evaporate'
41981db9ad8e (Qevaporate): New symbol.
Karl Heuer <kwzh@gnu.org>
parents: 8818
diff changeset
3453 property is set. */
41981db9ad8e (Qevaporate): New symbol.
Karl Heuer <kwzh@gnu.org>
parents: 8818
diff changeset
3454 void
41981db9ad8e (Qevaporate): New symbol.
Karl Heuer <kwzh@gnu.org>
parents: 8818
diff changeset
3455 evaporate_overlays (pos)
41981db9ad8e (Qevaporate): New symbol.
Karl Heuer <kwzh@gnu.org>
parents: 8818
diff changeset
3456 int pos;
41981db9ad8e (Qevaporate): New symbol.
Karl Heuer <kwzh@gnu.org>
parents: 8818
diff changeset
3457 {
41981db9ad8e (Qevaporate): New symbol.
Karl Heuer <kwzh@gnu.org>
parents: 8818
diff changeset
3458 Lisp_Object tail, overlay, hit_list;
41981db9ad8e (Qevaporate): New symbol.
Karl Heuer <kwzh@gnu.org>
parents: 8818
diff changeset
3459
41981db9ad8e (Qevaporate): New symbol.
Karl Heuer <kwzh@gnu.org>
parents: 8818
diff changeset
3460 hit_list = Qnil;
41981db9ad8e (Qevaporate): New symbol.
Karl Heuer <kwzh@gnu.org>
parents: 8818
diff changeset
3461 if (pos <= XFASTINT (current_buffer->overlay_center))
41981db9ad8e (Qevaporate): New symbol.
Karl Heuer <kwzh@gnu.org>
parents: 8818
diff changeset
3462 for (tail = current_buffer->overlays_before; CONSP (tail);
41981db9ad8e (Qevaporate): New symbol.
Karl Heuer <kwzh@gnu.org>
parents: 8818
diff changeset
3463 tail = XCONS (tail)->cdr)
41981db9ad8e (Qevaporate): New symbol.
Karl Heuer <kwzh@gnu.org>
parents: 8818
diff changeset
3464 {
41981db9ad8e (Qevaporate): New symbol.
Karl Heuer <kwzh@gnu.org>
parents: 8818
diff changeset
3465 int endpos;
41981db9ad8e (Qevaporate): New symbol.
Karl Heuer <kwzh@gnu.org>
parents: 8818
diff changeset
3466 overlay = XCONS (tail)->car;
41981db9ad8e (Qevaporate): New symbol.
Karl Heuer <kwzh@gnu.org>
parents: 8818
diff changeset
3467 endpos = OVERLAY_POSITION (OVERLAY_END (overlay));
41981db9ad8e (Qevaporate): New symbol.
Karl Heuer <kwzh@gnu.org>
parents: 8818
diff changeset
3468 if (endpos < pos)
41981db9ad8e (Qevaporate): New symbol.
Karl Heuer <kwzh@gnu.org>
parents: 8818
diff changeset
3469 break;
41981db9ad8e (Qevaporate): New symbol.
Karl Heuer <kwzh@gnu.org>
parents: 8818
diff changeset
3470 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
3471 && ! NILP (Foverlay_get (overlay, Qevaporate)))
8839
41981db9ad8e (Qevaporate): New symbol.
Karl Heuer <kwzh@gnu.org>
parents: 8818
diff changeset
3472 hit_list = Fcons (overlay, hit_list);
41981db9ad8e (Qevaporate): New symbol.
Karl Heuer <kwzh@gnu.org>
parents: 8818
diff changeset
3473 }
41981db9ad8e (Qevaporate): New symbol.
Karl Heuer <kwzh@gnu.org>
parents: 8818
diff changeset
3474 else
41981db9ad8e (Qevaporate): New symbol.
Karl Heuer <kwzh@gnu.org>
parents: 8818
diff changeset
3475 for (tail = current_buffer->overlays_after; CONSP (tail);
41981db9ad8e (Qevaporate): New symbol.
Karl Heuer <kwzh@gnu.org>
parents: 8818
diff changeset
3476 tail = XCONS (tail)->cdr)
41981db9ad8e (Qevaporate): New symbol.
Karl Heuer <kwzh@gnu.org>
parents: 8818
diff changeset
3477 {
41981db9ad8e (Qevaporate): New symbol.
Karl Heuer <kwzh@gnu.org>
parents: 8818
diff changeset
3478 int startpos;
9006
186aff8c1f51 (evaporate_overlays): Overlay is in car, not cdr.
Karl Heuer <kwzh@gnu.org>
parents: 8967
diff changeset
3479 overlay = XCONS (tail)->car;
8839
41981db9ad8e (Qevaporate): New symbol.
Karl Heuer <kwzh@gnu.org>
parents: 8818
diff changeset
3480 startpos = OVERLAY_POSITION (OVERLAY_START (overlay));
41981db9ad8e (Qevaporate): New symbol.
Karl Heuer <kwzh@gnu.org>
parents: 8818
diff changeset
3481 if (startpos > pos)
41981db9ad8e (Qevaporate): New symbol.
Karl Heuer <kwzh@gnu.org>
parents: 8818
diff changeset
3482 break;
41981db9ad8e (Qevaporate): New symbol.
Karl Heuer <kwzh@gnu.org>
parents: 8818
diff changeset
3483 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
3484 && ! NILP (Foverlay_get (overlay, Qevaporate)))
8839
41981db9ad8e (Qevaporate): New symbol.
Karl Heuer <kwzh@gnu.org>
parents: 8818
diff changeset
3485 hit_list = Fcons (overlay, hit_list);
41981db9ad8e (Qevaporate): New symbol.
Karl Heuer <kwzh@gnu.org>
parents: 8818
diff changeset
3486 }
41981db9ad8e (Qevaporate): New symbol.
Karl Heuer <kwzh@gnu.org>
parents: 8818
diff changeset
3487 for (; CONSP (hit_list); hit_list = XCONS (hit_list)->cdr)
41981db9ad8e (Qevaporate): New symbol.
Karl Heuer <kwzh@gnu.org>
parents: 8818
diff changeset
3488 Fdelete_overlay (XCONS (hit_list)->car);
41981db9ad8e (Qevaporate): New symbol.
Karl Heuer <kwzh@gnu.org>
parents: 8818
diff changeset
3489 }
4077
a860278e3ab3 (verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents: 3884
diff changeset
3490
9464
4bb620c9a075 (buffer_slot_type_mismatch): Take just the offset as argument. Only check
Karl Heuer <kwzh@gnu.org>
parents: 9438
diff changeset
3491 /* Somebody has tried to store a value with an unacceptable type
4bb620c9a075 (buffer_slot_type_mismatch): Take just the offset as argument. Only check
Karl Heuer <kwzh@gnu.org>
parents: 9438
diff changeset
3492 into the buffer-local slot with offset OFFSET. */
1001
c1ebe69206df * buffer.c (syms_of_buffer): Call DEFVAR_PER_BUFFER with the new
Jim Blandy <jimb@redhat.com>
parents: 764
diff changeset
3493 void
9464
4bb620c9a075 (buffer_slot_type_mismatch): Take just the offset as argument. Only check
Karl Heuer <kwzh@gnu.org>
parents: 9438
diff changeset
3494 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
3495 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
3496 {
9464
4bb620c9a075 (buffer_slot_type_mismatch): Take just the offset as argument. Only check
Karl Heuer <kwzh@gnu.org>
parents: 9438
diff changeset
3497 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
3498 char *type_name;
9464
4bb620c9a075 (buffer_slot_type_mismatch): Take just the offset as argument. Only check
Karl Heuer <kwzh@gnu.org>
parents: 9438
diff changeset
3499 sym = *(Lisp_Object *)(offset + (char *)&buffer_local_symbols);
1001
c1ebe69206df * buffer.c (syms_of_buffer): Call DEFVAR_PER_BUFFER with the new
Jim Blandy <jimb@redhat.com>
parents: 764
diff changeset
3500 switch (XINT (*(Lisp_Object *)(offset + (char *)&buffer_local_types)))
c1ebe69206df * buffer.c (syms_of_buffer): Call DEFVAR_PER_BUFFER with the new
Jim Blandy <jimb@redhat.com>
parents: 764
diff changeset
3501 {
c1ebe69206df * buffer.c (syms_of_buffer): Call DEFVAR_PER_BUFFER with the new
Jim Blandy <jimb@redhat.com>
parents: 764
diff changeset
3502 case Lisp_Int: type_name = "integers"; break;
c1ebe69206df * buffer.c (syms_of_buffer): Call DEFVAR_PER_BUFFER with the new
Jim Blandy <jimb@redhat.com>
parents: 764
diff changeset
3503 case Lisp_String: type_name = "strings"; break;
c1ebe69206df * buffer.c (syms_of_buffer): Call DEFVAR_PER_BUFFER with the new
Jim Blandy <jimb@redhat.com>
parents: 764
diff changeset
3504 case Lisp_Symbol: type_name = "symbols"; break;
c1ebe69206df * buffer.c (syms_of_buffer): Call DEFVAR_PER_BUFFER with the new
Jim Blandy <jimb@redhat.com>
parents: 764
diff changeset
3505 default:
c1ebe69206df * buffer.c (syms_of_buffer): Call DEFVAR_PER_BUFFER with the new
Jim Blandy <jimb@redhat.com>
parents: 764
diff changeset
3506 abort ();
c1ebe69206df * buffer.c (syms_of_buffer): Call DEFVAR_PER_BUFFER with the new
Jim Blandy <jimb@redhat.com>
parents: 764
diff changeset
3507 }
c1ebe69206df * buffer.c (syms_of_buffer): Call DEFVAR_PER_BUFFER with the new
Jim Blandy <jimb@redhat.com>
parents: 764
diff changeset
3508
c1ebe69206df * buffer.c (syms_of_buffer): Call DEFVAR_PER_BUFFER with the new
Jim Blandy <jimb@redhat.com>
parents: 764
diff changeset
3509 error ("only %s should be stored in the buffer-local variable %s",
9464
4bb620c9a075 (buffer_slot_type_mismatch): Take just the offset as argument. Only check
Karl Heuer <kwzh@gnu.org>
parents: 9438
diff changeset
3510 type_name, XSYMBOL (sym)->name->data);
1001
c1ebe69206df * buffer.c (syms_of_buffer): Call DEFVAR_PER_BUFFER with the new
Jim Blandy <jimb@redhat.com>
parents: 764
diff changeset
3511 }
c1ebe69206df * buffer.c (syms_of_buffer): Call DEFVAR_PER_BUFFER with the new
Jim Blandy <jimb@redhat.com>
parents: 764
diff changeset
3512
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3513 init_buffer_once ()
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3514 {
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3515 register Lisp_Object tem;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3516
15776
6018e01d4466 (buffer_permanent_local_flags): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 15638
diff changeset
3517 buffer_permanent_local_flags = 0;
6018e01d4466 (buffer_permanent_local_flags): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 15638
diff changeset
3518
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3519 /* Make sure all markable slots in buffer_defaults
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3520 are initialized reasonably, so mark_buffer won't choke. */
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3521 reset_buffer (&buffer_defaults);
15776
6018e01d4466 (buffer_permanent_local_flags): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 15638
diff changeset
3522 reset_buffer_local_variables (&buffer_defaults, 1);
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3523 reset_buffer (&buffer_local_symbols);
15776
6018e01d4466 (buffer_permanent_local_flags): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 15638
diff changeset
3524 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
3525 /* Prevent GC from getting confused. */
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
3526 buffer_defaults.text = &buffer_defaults.own_text;
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
3527 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
3528 #ifdef USE_TEXT_PROPERTIES
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
3529 BUF_INTERVALS (&buffer_defaults) = 0;
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
3530 BUF_INTERVALS (&buffer_local_symbols) = 0;
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
3531 #endif
9262
582534b6e763 (Fget_buffer_create, Frename_buffer, Fbuffer_disable_undo,
Karl Heuer <kwzh@gnu.org>
parents: 9211
diff changeset
3532 XSETBUFFER (Vbuffer_defaults, &buffer_defaults);
582534b6e763 (Fget_buffer_create, Frename_buffer, Fbuffer_disable_undo,
Karl Heuer <kwzh@gnu.org>
parents: 9211
diff changeset
3533 XSETBUFFER (Vbuffer_local_symbols, &buffer_local_symbols);
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3534
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3535 /* Set up the default values of various buffer slots. */
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3536 /* Must do these before making the first buffer! */
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3537
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3538 /* real setup is done in loaddefs.el */
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3539 buffer_defaults.mode_line_format = build_string ("%-");
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3540 buffer_defaults.abbrev_mode = Qnil;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3541 buffer_defaults.overwrite_mode = Qnil;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3542 buffer_defaults.case_fold_search = Qt;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3543 buffer_defaults.auto_fill_function = Qnil;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3544 buffer_defaults.selective_display = Qnil;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3545 #ifndef old
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3546 buffer_defaults.selective_display_ellipses = Qt;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3547 #endif
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3548 buffer_defaults.abbrev_table = Qnil;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3549 buffer_defaults.display_table = Qnil;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3550 buffer_defaults.undo_list = Qnil;
2043
a1ab3501653c (reset_buffer_local_variables): Reset mark_active.
Richard M. Stallman <rms@gnu.org>
parents: 2020
diff changeset
3551 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
3552 buffer_defaults.file_format = Qnil;
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3553 buffer_defaults.overlays_before = Qnil;
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3554 buffer_defaults.overlays_after = Qnil;
11693
efef31f1c42d (Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents: 11659
diff changeset
3555 XSETFASTINT (buffer_defaults.overlay_center, BEG);
9296
a1a7fc21ded9 (reset_buffer, Ferase_buffer, validate_region, list_buffers_1, recenter_overlay_lists, init_buffer_once): Don't use XFASTINT as an lvalue.
Karl Heuer <kwzh@gnu.org>
parents: 9262
diff changeset
3556
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
3557 XSETFASTINT (buffer_defaults.tab_width, 8);
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3558 buffer_defaults.truncate_lines = Qnil;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3559 buffer_defaults.ctl_arrow = Qt;
17022
907fb167f7de Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16840
diff changeset
3560 buffer_defaults.direction_reversed = Qnil;
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3561
9785
a72386110d83 (init_buffer): Use DIRECTORY_SEP, IS_DIRECTORY_SEP macros,
Richard M. Stallman <rms@gnu.org>
parents: 9732
diff changeset
3562 #ifdef DOS_NT
7270
0f79f4bd3c62 (init_buffer_once): Initialize buffer_file_type field right.
Richard M. Stallman <rms@gnu.org>
parents: 7062
diff changeset
3563 buffer_defaults.buffer_file_type = Qnil; /* TEXT */
5502
2b48fd9bc80e [MSDOS]: New buffer-local variable:
Richard M. Stallman <rms@gnu.org>
parents: 5433
diff changeset
3564 #endif
17124
fdad8ea24563 (init_buffer_once): Make member
Kenichi Handa <handa@m17n.org>
parents: 17022
diff changeset
3565 buffer_defaults.enable_multibyte_characters = Qt;
18178
b45b431879bf (init_buffer_once): Inititialize the member
Kenichi Handa <handa@m17n.org>
parents: 18105
diff changeset
3566 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
3567 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
3568 XSETFASTINT (buffer_defaults.left_margin, 0);
9403
9f797989b817 * buffer.c: #include region-cache.h.
Jim Blandy <jimb@redhat.com>
parents: 9362
diff changeset
3569 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
3570 buffer_defaults.file_truename = Qnil;
17218
a57ca25e9c62 (reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents: 17124
diff changeset
3571 XSETFASTINT (buffer_defaults.display_count, 0);
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3572
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3573 /* Assign the local-flags to the slots that have default values.
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3574 The local flag is a bit that is used in the buffer
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3575 to say that it has its own local value for the slot.
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3576 The local flag bits are in the local_var_flags slot of the buffer. */
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3577
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3578 /* 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
3579 if (sizeof (EMACS_INT) != sizeof (Lisp_Object)) abort ();
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3580
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3581 /* 0 means not a lisp var, -1 means always local, else mask */
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3582 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
3583 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
3584 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
3585 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
3586 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
3587 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
3588 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
3589 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
3590 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
3591 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
3592 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
3593 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
3594 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
3595 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
3596 XSETINT (buffer_local_flags.file_format, -1);
17218
a57ca25e9c62 (reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents: 17124
diff changeset
3597 XSETINT (buffer_local_flags.display_count, -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
3598
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
3599 XSETFASTINT (buffer_local_flags.mode_line_format, 1);
a1a7fc21ded9 (reset_buffer, Ferase_buffer, validate_region, list_buffers_1, recenter_overlay_lists, init_buffer_once): Don't use XFASTINT as an lvalue.
Karl Heuer <kwzh@gnu.org>
parents: 9262
diff changeset
3600 XSETFASTINT (buffer_local_flags.abbrev_mode, 2);
a1a7fc21ded9 (reset_buffer, Ferase_buffer, validate_region, list_buffers_1, recenter_overlay_lists, init_buffer_once): Don't use XFASTINT as an lvalue.
Karl Heuer <kwzh@gnu.org>
parents: 9262
diff changeset
3601 XSETFASTINT (buffer_local_flags.overwrite_mode, 4);
a1a7fc21ded9 (reset_buffer, Ferase_buffer, validate_region, list_buffers_1, recenter_overlay_lists, init_buffer_once): Don't use XFASTINT as an lvalue.
Karl Heuer <kwzh@gnu.org>
parents: 9262
diff changeset
3602 XSETFASTINT (buffer_local_flags.case_fold_search, 8);
a1a7fc21ded9 (reset_buffer, Ferase_buffer, validate_region, list_buffers_1, recenter_overlay_lists, init_buffer_once): Don't use XFASTINT as an lvalue.
Karl Heuer <kwzh@gnu.org>
parents: 9262
diff changeset
3603 XSETFASTINT (buffer_local_flags.auto_fill_function, 0x10);
a1a7fc21ded9 (reset_buffer, Ferase_buffer, validate_region, list_buffers_1, recenter_overlay_lists, init_buffer_once): Don't use XFASTINT as an lvalue.
Karl Heuer <kwzh@gnu.org>
parents: 9262
diff changeset
3604 XSETFASTINT (buffer_local_flags.selective_display, 0x20);
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3605 #ifndef old
9296
a1a7fc21ded9 (reset_buffer, Ferase_buffer, validate_region, list_buffers_1, recenter_overlay_lists, init_buffer_once): Don't use XFASTINT as an lvalue.
Karl Heuer <kwzh@gnu.org>
parents: 9262
diff changeset
3606 XSETFASTINT (buffer_local_flags.selective_display_ellipses, 0x40);
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3607 #endif
9296
a1a7fc21ded9 (reset_buffer, Ferase_buffer, validate_region, list_buffers_1, recenter_overlay_lists, init_buffer_once): Don't use XFASTINT as an lvalue.
Karl Heuer <kwzh@gnu.org>
parents: 9262
diff changeset
3608 XSETFASTINT (buffer_local_flags.tab_width, 0x80);
a1a7fc21ded9 (reset_buffer, Ferase_buffer, validate_region, list_buffers_1, recenter_overlay_lists, init_buffer_once): Don't use XFASTINT as an lvalue.
Karl Heuer <kwzh@gnu.org>
parents: 9262
diff changeset
3609 XSETFASTINT (buffer_local_flags.truncate_lines, 0x100);
a1a7fc21ded9 (reset_buffer, Ferase_buffer, validate_region, list_buffers_1, recenter_overlay_lists, init_buffer_once): Don't use XFASTINT as an lvalue.
Karl Heuer <kwzh@gnu.org>
parents: 9262
diff changeset
3610 XSETFASTINT (buffer_local_flags.ctl_arrow, 0x200);
a1a7fc21ded9 (reset_buffer, Ferase_buffer, validate_region, list_buffers_1, recenter_overlay_lists, init_buffer_once): Don't use XFASTINT as an lvalue.
Karl Heuer <kwzh@gnu.org>
parents: 9262
diff changeset
3611 XSETFASTINT (buffer_local_flags.fill_column, 0x400);
a1a7fc21ded9 (reset_buffer, Ferase_buffer, validate_region, list_buffers_1, recenter_overlay_lists, init_buffer_once): Don't use XFASTINT as an lvalue.
Karl Heuer <kwzh@gnu.org>
parents: 9262
diff changeset
3612 XSETFASTINT (buffer_local_flags.left_margin, 0x800);
a1a7fc21ded9 (reset_buffer, Ferase_buffer, validate_region, list_buffers_1, recenter_overlay_lists, init_buffer_once): Don't use XFASTINT as an lvalue.
Karl Heuer <kwzh@gnu.org>
parents: 9262
diff changeset
3613 XSETFASTINT (buffer_local_flags.abbrev_table, 0x1000);
a1a7fc21ded9 (reset_buffer, Ferase_buffer, validate_region, list_buffers_1, recenter_overlay_lists, init_buffer_once): Don't use XFASTINT as an lvalue.
Karl Heuer <kwzh@gnu.org>
parents: 9262
diff changeset
3614 XSETFASTINT (buffer_local_flags.display_table, 0x2000);
9785
a72386110d83 (init_buffer): Use DIRECTORY_SEP, IS_DIRECTORY_SEP macros,
Richard M. Stallman <rms@gnu.org>
parents: 9732
diff changeset
3615 #ifdef DOS_NT
9296
a1a7fc21ded9 (reset_buffer, Ferase_buffer, validate_region, list_buffers_1, recenter_overlay_lists, init_buffer_once): Don't use XFASTINT as an lvalue.
Karl Heuer <kwzh@gnu.org>
parents: 9262
diff changeset
3616 XSETFASTINT (buffer_local_flags.buffer_file_type, 0x4000);
15776
6018e01d4466 (buffer_permanent_local_flags): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 15638
diff changeset
3617 /* Make this one a permanent local. */
6018e01d4466 (buffer_permanent_local_flags): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 15638
diff changeset
3618 buffer_permanent_local_flags |= 0x4000;
5502
2b48fd9bc80e [MSDOS]: New buffer-local variable:
Richard M. Stallman <rms@gnu.org>
parents: 5433
diff changeset
3619 #endif
15786
f2d0e8928d57 (buffer_permanent_local_flags): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 15776
diff changeset
3620 XSETFASTINT (buffer_local_flags.syntax_table, 0x8000);
f2d0e8928d57 (buffer_permanent_local_flags): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 15776
diff changeset
3621 XSETFASTINT (buffer_local_flags.cache_long_line_scans, 0x10000);
17022
907fb167f7de Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16840
diff changeset
3622 XSETFASTINT (buffer_local_flags.category_table, 0x20000);
907fb167f7de Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16840
diff changeset
3623 XSETFASTINT (buffer_local_flags.direction_reversed, 0x40000);
17124
fdad8ea24563 (init_buffer_once): Make member
Kenichi Handa <handa@m17n.org>
parents: 17022
diff changeset
3624 XSETFASTINT (buffer_local_flags.enable_multibyte_characters, 0x80000);
fdad8ea24563 (init_buffer_once): Make member
Kenichi Handa <handa@m17n.org>
parents: 17022
diff changeset
3625 /* Make this one a permanent local. */
fdad8ea24563 (init_buffer_once): Make member
Kenichi Handa <handa@m17n.org>
parents: 17022
diff changeset
3626 buffer_permanent_local_flags |= 0x80000;
18178
b45b431879bf (init_buffer_once): Inititialize the member
Kenichi Handa <handa@m17n.org>
parents: 18105
diff changeset
3627 XSETFASTINT (buffer_local_flags.buffer_file_coding_system, 0x100000);
b45b431879bf (init_buffer_once): Inititialize the member
Kenichi Handa <handa@m17n.org>
parents: 18105
diff changeset
3628 /* Make this one a permanent local. */
b45b431879bf (init_buffer_once): Inititialize the member
Kenichi Handa <handa@m17n.org>
parents: 18105
diff changeset
3629 buffer_permanent_local_flags |= 0x100000;
b45b431879bf (init_buffer_once): Inititialize the member
Kenichi Handa <handa@m17n.org>
parents: 18105
diff changeset
3630
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3631 Vbuffer_alist = Qnil;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3632 current_buffer = 0;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3633 all_buffers = 0;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3634
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3635 QSFundamental = build_string ("Fundamental");
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3636
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3637 Qfundamental_mode = intern ("fundamental-mode");
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3638 buffer_defaults.major_mode = Qfundamental_mode;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3639
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3640 Qmode_class = intern ("mode-class");
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3641
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3642 Qprotected_field = intern ("protected-field");
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3643
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3644 Qpermanent_local = intern ("permanent-local");
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3645
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3646 Qkill_buffer_hook = intern ("kill-buffer-hook");
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3647
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3648 Vprin1_to_string_buffer = Fget_buffer_create (build_string (" prin1"));
14396
c486932b7301 Whitespace change.
Richard M. Stallman <rms@gnu.org>
parents: 14226
diff changeset
3649
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3650 /* super-magic invisible buffer */
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3651 Vbuffer_alist = Qnil;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3652
648
70b112526394 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 585
diff changeset
3653 Fset_buffer (Fget_buffer_create (build_string ("*scratch*")));
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3654 }
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3655
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3656 init_buffer ()
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3657 {
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3658 char buf[MAXPATHLEN+1];
1563
e721339972b0 * buffer.c (init_buffer): If PWD is accurate, use it instead of
Jim Blandy <jimb@redhat.com>
parents: 1501
diff changeset
3659 char *pwd;
e721339972b0 * buffer.c (init_buffer): If PWD is accurate, use it instead of
Jim Blandy <jimb@redhat.com>
parents: 1501
diff changeset
3660 struct stat dotstat, pwdstat;
3463
aa78c7babb8e (init_buffer): Init default-directory of minibuffer.
Richard M. Stallman <rms@gnu.org>
parents: 3329
diff changeset
3661 Lisp_Object temp;
9785
a72386110d83 (init_buffer): Use DIRECTORY_SEP, IS_DIRECTORY_SEP macros,
Richard M. Stallman <rms@gnu.org>
parents: 9732
diff changeset
3662 int rc;
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3663
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3664 Fset_buffer (Fget_buffer_create (build_string ("*scratch*")));
1563
e721339972b0 * buffer.c (init_buffer): If PWD is accurate, use it instead of
Jim Blandy <jimb@redhat.com>
parents: 1501
diff changeset
3665
e721339972b0 * buffer.c (init_buffer): If PWD is accurate, use it instead of
Jim Blandy <jimb@redhat.com>
parents: 1501
diff changeset
3666 /* If PWD is accurate, use it instead of calling getwd. This is faster
e721339972b0 * buffer.c (init_buffer): If PWD is accurate, use it instead of
Jim Blandy <jimb@redhat.com>
parents: 1501
diff changeset
3667 when PWD is right, and may avoid a fatal error. */
9785
a72386110d83 (init_buffer): Use DIRECTORY_SEP, IS_DIRECTORY_SEP macros,
Richard M. Stallman <rms@gnu.org>
parents: 9732
diff changeset
3668 if ((pwd = getenv ("PWD")) != 0 && IS_DIRECTORY_SEP (*pwd)
1563
e721339972b0 * buffer.c (init_buffer): If PWD is accurate, use it instead of
Jim Blandy <jimb@redhat.com>
parents: 1501
diff changeset
3669 && stat (pwd, &pwdstat) == 0
e721339972b0 * buffer.c (init_buffer): If PWD is accurate, use it instead of
Jim Blandy <jimb@redhat.com>
parents: 1501
diff changeset
3670 && stat (".", &dotstat) == 0
e721339972b0 * buffer.c (init_buffer): If PWD is accurate, use it instead of
Jim Blandy <jimb@redhat.com>
parents: 1501
diff changeset
3671 && dotstat.st_ino == pwdstat.st_ino
e721339972b0 * buffer.c (init_buffer): If PWD is accurate, use it instead of
Jim Blandy <jimb@redhat.com>
parents: 1501
diff changeset
3672 && dotstat.st_dev == pwdstat.st_dev
e721339972b0 * buffer.c (init_buffer): If PWD is accurate, use it instead of
Jim Blandy <jimb@redhat.com>
parents: 1501
diff changeset
3673 && strlen (pwd) < MAXPATHLEN)
e721339972b0 * buffer.c (init_buffer): If PWD is accurate, use it instead of
Jim Blandy <jimb@redhat.com>
parents: 1501
diff changeset
3674 strcpy (buf, pwd);
e721339972b0 * buffer.c (init_buffer): If PWD is accurate, use it instead of
Jim Blandy <jimb@redhat.com>
parents: 1501
diff changeset
3675 else if (getwd (buf) == 0)
9810
c76b3e670eb3 (init_buffer): Fix error message syntax.
Richard M. Stallman <rms@gnu.org>
parents: 9785
diff changeset
3676 fatal ("`getwd' failed: %s\n", buf);
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3677
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3678 #ifndef VMS
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3679 /* Maybe this should really use some standard subroutine
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3680 whose definition is filename syntax dependent. */
9785
a72386110d83 (init_buffer): Use DIRECTORY_SEP, IS_DIRECTORY_SEP macros,
Richard M. Stallman <rms@gnu.org>
parents: 9732
diff changeset
3681 rc = strlen (buf);
a72386110d83 (init_buffer): Use DIRECTORY_SEP, IS_DIRECTORY_SEP macros,
Richard M. Stallman <rms@gnu.org>
parents: 9732
diff changeset
3682 if (!(IS_DIRECTORY_SEP (buf[rc - 1])))
a72386110d83 (init_buffer): Use DIRECTORY_SEP, IS_DIRECTORY_SEP macros,
Richard M. Stallman <rms@gnu.org>
parents: 9732
diff changeset
3683 {
a72386110d83 (init_buffer): Use DIRECTORY_SEP, IS_DIRECTORY_SEP macros,
Richard M. Stallman <rms@gnu.org>
parents: 9732
diff changeset
3684 buf[rc] = DIRECTORY_SEP;
a72386110d83 (init_buffer): Use DIRECTORY_SEP, IS_DIRECTORY_SEP macros,
Richard M. Stallman <rms@gnu.org>
parents: 9732
diff changeset
3685 buf[rc + 1] = '\0';
a72386110d83 (init_buffer): Use DIRECTORY_SEP, IS_DIRECTORY_SEP macros,
Richard M. Stallman <rms@gnu.org>
parents: 9732
diff changeset
3686 }
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3687 #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
3688
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3689 current_buffer->directory = build_string (buf);
3463
aa78c7babb8e (init_buffer): Init default-directory of minibuffer.
Richard M. Stallman <rms@gnu.org>
parents: 3329
diff changeset
3690
16384
4ec13b05b0fa (init_buffer): Add /: to dir names that could be magic.
Richard M. Stallman <rms@gnu.org>
parents: 16370
diff changeset
3691 /* 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
3692 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
3693 temp = Ffind_file_name_handler (current_buffer->directory, Qt);
4ec13b05b0fa (init_buffer): Add /: to dir names that could be magic.
Richard M. Stallman <rms@gnu.org>
parents: 16370
diff changeset
3694 if (! NILP (temp))
4ec13b05b0fa (init_buffer): Add /: to dir names that could be magic.
Richard M. Stallman <rms@gnu.org>
parents: 16370
diff changeset
3695 current_buffer->directory
4ec13b05b0fa (init_buffer): Add /: to dir names that could be magic.
Richard M. Stallman <rms@gnu.org>
parents: 16370
diff changeset
3696 = 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
3697
3463
aa78c7babb8e (init_buffer): Init default-directory of minibuffer.
Richard M. Stallman <rms@gnu.org>
parents: 3329
diff changeset
3698 temp = get_minibuffer (0);
aa78c7babb8e (init_buffer): Init default-directory of minibuffer.
Richard M. Stallman <rms@gnu.org>
parents: 3329
diff changeset
3699 XBUFFER (temp)->directory = current_buffer->directory;
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3700 }
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3701
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3702 /* initialize the buffer routines */
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3703 syms_of_buffer ()
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3704 {
2060
7eea4dfc5133 (syms_of_buffer): Make erase-buffer a disabled command.
Roland McGrath <roland@gnu.org>
parents: 2043
diff changeset
3705 extern Lisp_Object Qdisabled;
7eea4dfc5133 (syms_of_buffer): Make erase-buffer a disabled command.
Roland McGrath <roland@gnu.org>
parents: 2043
diff changeset
3706
12538
5920994b14c2 (last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 12488
diff changeset
3707 staticpro (&last_overlay_modification_hooks);
5920994b14c2 (last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 12488
diff changeset
3708 last_overlay_modification_hooks
5920994b14c2 (last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 12488
diff changeset
3709 = Fmake_vector (make_number (10), Qnil);
5920994b14c2 (last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 12488
diff changeset
3710
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3711 staticpro (&Vbuffer_defaults);
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3712 staticpro (&Vbuffer_local_symbols);
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3713 staticpro (&Qfundamental_mode);
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3714 staticpro (&Qmode_class);
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3715 staticpro (&QSFundamental);
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3716 staticpro (&Vbuffer_alist);
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3717 staticpro (&Qprotected_field);
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3718 staticpro (&Qpermanent_local);
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3719 staticpro (&Qkill_buffer_hook);
12785
937df231678c (Qbefore_change_functions, Qafter_change_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 12699
diff changeset
3720 Qoverlayp = intern ("overlayp");
2776
8bf3bb4c20dd * lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents: 2722
diff changeset
3721 staticpro (&Qoverlayp);
8839
41981db9ad8e (Qevaporate): New symbol.
Karl Heuer <kwzh@gnu.org>
parents: 8818
diff changeset
3722 Qevaporate = intern ("evaporate");
41981db9ad8e (Qevaporate): New symbol.
Karl Heuer <kwzh@gnu.org>
parents: 8818
diff changeset
3723 staticpro (&Qevaporate);
12785
937df231678c (Qbefore_change_functions, Qafter_change_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 12699
diff changeset
3724 Qmodification_hooks = intern ("modification-hooks");
4213
616036bb2427 (Qmodification_hooks, Qinsert_in_front_hooks)
Richard M. Stallman <rms@gnu.org>
parents: 4100
diff changeset
3725 staticpro (&Qmodification_hooks);
616036bb2427 (Qmodification_hooks, Qinsert_in_front_hooks)
Richard M. Stallman <rms@gnu.org>
parents: 4100
diff changeset
3726 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
3727 staticpro (&Qinsert_in_front_hooks);
4213
616036bb2427 (Qmodification_hooks, Qinsert_in_front_hooks)
Richard M. Stallman <rms@gnu.org>
parents: 4100
diff changeset
3728 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
3729 staticpro (&Qinsert_behind_hooks);
937df231678c (Qbefore_change_functions, Qafter_change_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 12699
diff changeset
3730 Qget_file_buffer = intern ("get-file-buffer");
5433
7ac1e6f1565f Don't include syntax.h.
Richard M. Stallman <rms@gnu.org>
parents: 5247
diff changeset
3731 staticpro (&Qget_file_buffer);
5857
03f8720af7fb (sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents: 5703
diff changeset
3732 Qpriority = intern ("priority");
03f8720af7fb (sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents: 5703
diff changeset
3733 staticpro (&Qpriority);
03f8720af7fb (sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents: 5703
diff changeset
3734 Qwindow = intern ("window");
03f8720af7fb (sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents: 5703
diff changeset
3735 staticpro (&Qwindow);
11693
efef31f1c42d (Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents: 11659
diff changeset
3736 Qbefore_string = intern ("before-string");
efef31f1c42d (Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents: 11659
diff changeset
3737 staticpro (&Qbefore_string);
efef31f1c42d (Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents: 11659
diff changeset
3738 Qafter_string = intern ("after-string");
efef31f1c42d (Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents: 11659
diff changeset
3739 staticpro (&Qafter_string);
12785
937df231678c (Qbefore_change_functions, Qafter_change_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 12699
diff changeset
3740 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
3741 staticpro (&Qfirst_change_hook);
937df231678c (Qbefore_change_functions, Qafter_change_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 12699
diff changeset
3742 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
3743 staticpro (&Qbefore_change_functions);
937df231678c (Qbefore_change_functions, Qafter_change_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 12699
diff changeset
3744 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
3745 staticpro (&Qafter_change_functions);
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3746
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3747 Fput (Qprotected_field, Qerror_conditions,
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3748 Fcons (Qprotected_field, Fcons (Qerror, Qnil)));
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3749 Fput (Qprotected_field, Qerror_message,
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3750 build_string ("Attempt to modify a protected field"));
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3751
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3752 /* All these use DEFVAR_LISP_NOPRO because the slots in
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3753 buffer_defaults will all be marked via Vbuffer_defaults. */
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3754
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3755 DEFVAR_LISP_NOPRO ("default-mode-line-format",
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3756 &buffer_defaults.mode_line_format,
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3757 "Default value of `mode-line-format' for buffers that don't override it.\n\
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3758 This is the same as (default-value 'mode-line-format).");
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3759
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3760 DEFVAR_LISP_NOPRO ("default-abbrev-mode",
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3761 &buffer_defaults.abbrev_mode,
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3762 "Default value of `abbrev-mode' for buffers that do not override it.\n\
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3763 This is the same as (default-value 'abbrev-mode).");
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3764
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3765 DEFVAR_LISP_NOPRO ("default-ctl-arrow",
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3766 &buffer_defaults.ctl_arrow,
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3767 "Default value of `ctl-arrow' for buffers that do not override it.\n\
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3768 This is the same as (default-value 'ctl-arrow).");
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3769
17022
907fb167f7de Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16840
diff changeset
3770 DEFVAR_LISP_NOPRO ("default-direction-reversed",
907fb167f7de Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16840
diff changeset
3771 &buffer_defaults.direction_reversed,
907fb167f7de Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16840
diff changeset
3772 "Default value of `direction_reversed' for buffers that do not override it.\n\
907fb167f7de Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16840
diff changeset
3773 This is the same as (default-value 'direction-reversed).");
907fb167f7de Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16840
diff changeset
3774
17124
fdad8ea24563 (init_buffer_once): Make member
Kenichi Handa <handa@m17n.org>
parents: 17022
diff changeset
3775 DEFVAR_LISP_NOPRO ("default-enable-multibyte-characters",
fdad8ea24563 (init_buffer_once): Make member
Kenichi Handa <handa@m17n.org>
parents: 17022
diff changeset
3776 &buffer_defaults.enable_multibyte_characters,
fdad8ea24563 (init_buffer_once): Make member
Kenichi Handa <handa@m17n.org>
parents: 17022
diff changeset
3777 "Default value of `enable-multibyte-characters' for buffers not overriding it.\n\
fdad8ea24563 (init_buffer_once): Make member
Kenichi Handa <handa@m17n.org>
parents: 17022
diff changeset
3778 This is the same as (default-value 'enable-multibyte-characters).");
fdad8ea24563 (init_buffer_once): Make member
Kenichi Handa <handa@m17n.org>
parents: 17022
diff changeset
3779
18178
b45b431879bf (init_buffer_once): Inititialize the member
Kenichi Handa <handa@m17n.org>
parents: 18105
diff changeset
3780 DEFVAR_LISP_NOPRO ("default-buffer-file-coding-system",
b45b431879bf (init_buffer_once): Inititialize the member
Kenichi Handa <handa@m17n.org>
parents: 18105
diff changeset
3781 &buffer_defaults.buffer_file_coding_system,
b45b431879bf (init_buffer_once): Inititialize the member
Kenichi Handa <handa@m17n.org>
parents: 18105
diff changeset
3782 "Default value of `buffer-file-coding-system' for buffers not overriding it.\n\
b45b431879bf (init_buffer_once): Inititialize the member
Kenichi Handa <handa@m17n.org>
parents: 18105
diff changeset
3783 This is the same as (default-value 'buffer-file-coding-system).");
b45b431879bf (init_buffer_once): Inititialize the member
Kenichi Handa <handa@m17n.org>
parents: 18105
diff changeset
3784
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3785 DEFVAR_LISP_NOPRO ("default-truncate-lines",
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3786 &buffer_defaults.truncate_lines,
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3787 "Default value of `truncate-lines' for buffers that do not override it.\n\
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3788 This is the same as (default-value 'truncate-lines).");
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3789
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3790 DEFVAR_LISP_NOPRO ("default-fill-column",
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3791 &buffer_defaults.fill_column,
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3792 "Default value of `fill-column' for buffers that do not override it.\n\
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3793 This is the same as (default-value 'fill-column).");
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3794
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3795 DEFVAR_LISP_NOPRO ("default-left-margin",
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3796 &buffer_defaults.left_margin,
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3797 "Default value of `left-margin' for buffers that do not override it.\n\
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3798 This is the same as (default-value 'left-margin).");
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3799
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3800 DEFVAR_LISP_NOPRO ("default-tab-width",
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3801 &buffer_defaults.tab_width,
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3802 "Default value of `tab-width' for buffers that do not override it.\n\
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3803 This is the same as (default-value 'tab-width).");
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3804
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3805 DEFVAR_LISP_NOPRO ("default-case-fold-search",
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3806 &buffer_defaults.case_fold_search,
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3807 "Default value of `case-fold-search' for buffers that don't override it.\n\
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3808 This is the same as (default-value 'case-fold-search).");
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3809
9785
a72386110d83 (init_buffer): Use DIRECTORY_SEP, IS_DIRECTORY_SEP macros,
Richard M. Stallman <rms@gnu.org>
parents: 9732
diff changeset
3810 #ifdef DOS_NT
5502
2b48fd9bc80e [MSDOS]: New buffer-local variable:
Richard M. Stallman <rms@gnu.org>
parents: 5433
diff changeset
3811 DEFVAR_LISP_NOPRO ("default-buffer-file-type",
2b48fd9bc80e [MSDOS]: New buffer-local variable:
Richard M. Stallman <rms@gnu.org>
parents: 5433
diff changeset
3812 &buffer_defaults.buffer_file_type,
2b48fd9bc80e [MSDOS]: New buffer-local variable:
Richard M. Stallman <rms@gnu.org>
parents: 5433
diff changeset
3813 "Default file type for buffers that do not override it.\n\
2b48fd9bc80e [MSDOS]: New buffer-local variable:
Richard M. Stallman <rms@gnu.org>
parents: 5433
diff changeset
3814 This is the same as (default-value 'buffer-file-type).\n\
2b48fd9bc80e [MSDOS]: New buffer-local variable:
Richard M. Stallman <rms@gnu.org>
parents: 5433
diff changeset
3815 The file type is nil for text, t for binary.");
2b48fd9bc80e [MSDOS]: New buffer-local variable:
Richard M. Stallman <rms@gnu.org>
parents: 5433
diff changeset
3816 #endif
2b48fd9bc80e [MSDOS]: New buffer-local variable:
Richard M. Stallman <rms@gnu.org>
parents: 5433
diff changeset
3817
1001
c1ebe69206df * buffer.c (syms_of_buffer): Call DEFVAR_PER_BUFFER with the new
Jim Blandy <jimb@redhat.com>
parents: 764
diff changeset
3818 DEFVAR_PER_BUFFER ("mode-line-format", &current_buffer->mode_line_format,
c1ebe69206df * buffer.c (syms_of_buffer): Call DEFVAR_PER_BUFFER with the new
Jim Blandy <jimb@redhat.com>
parents: 764
diff changeset
3819 Qnil, 0);
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3820
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3821 /* This doc string is too long for cpp; cpp dies if it isn't in a comment.
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3822 But make-docfile finds it!
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3823 DEFVAR_PER_BUFFER ("mode-line-format", &current_buffer->mode_line_format,
1985
666e3f26a8d6 * buffer.c (buffer-undo-list): Doc fix.
Jim Blandy <jimb@redhat.com>
parents: 1953
diff changeset
3824 Qnil,
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3825 "Template for displaying mode line for current buffer.\n\
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3826 Each buffer has its own value of this variable.\n\
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3827 Value may be a string, a symbol or a list or cons cell.\n\
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3828 For a symbol, its value is used (but it is ignored if t or nil).\n\
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3829 A string appearing directly as the value of a symbol is processed verbatim\n\
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3830 in that the %-constructs below are not recognized.\n\
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3831 For a list whose car is a symbol, the symbol's value is taken,\n\
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3832 and if that is non-nil, the cadr of the list is processed recursively.\n\
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3833 Otherwise, the caddr of the list (if there is one) is processed.\n\
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3834 For a list whose car is a string or list, each element is processed\n\
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3835 recursively and the results are effectively concatenated.\n\
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3836 For a list whose car is an integer, the cdr of the list is processed\n\
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3837 and padded (if the number is positive) or truncated (if negative)\n\
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3838 to the width specified by that number.\n\
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3839 A string is printed verbatim in the mode line except for %-constructs:\n\
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3840 (%-constructs are allowed when the string is the entire mode-line-format\n\
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3841 or when it is found in a cons-cell or a list)\n\
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3842 %b -- print buffer name. %f -- print visited file name.\n\
8125
3941618b4c2b (syms_of_buffer): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 8123
diff changeset
3843 %* -- print %, * or hyphen. %+ -- print *, % or hyphen.\n\
3941618b4c2b (syms_of_buffer): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 8123
diff changeset
3844 % means buffer is read-only and * means it is modified.\n\
3941618b4c2b (syms_of_buffer): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 8123
diff changeset
3845 For a modified read-only buffer, %* gives % and %+ gives *.\n\
2578
f694fc6cdd33 (Qmode-line-format): Describe %l in the doc string.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 2508
diff changeset
3846 %s -- print process status. %l -- print the current line number.\n\
15032
0d32c8a2ae39 (syms_of_buffer): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 14506
diff changeset
3847 %c -- print the current column number (this makes editing slower).\n\
5904
7f95b8e1ec44 (syms_of_buffer): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 5873
diff changeset
3848 %p -- print percent of buffer above top of window, or Top, Bot or All.\n\
7295
3f9ea1ad1c65 (syms_of_buffer): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 7270
diff changeset
3849 %P -- print percent of buffer above bottom of window, perhaps plus Top,\n\
5904
7f95b8e1ec44 (syms_of_buffer): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 5873
diff changeset
3850 or print Bottom or All.\n\
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3851 %n -- print Narrow if appropriate.\n\
16370
d45a787999ef (syms_of_buffer): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 16243
diff changeset
3852 %t -- print T if file is text, B if binary.\n\
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3853 %[ -- print one [ for each recursive editing level. %] similar.\n\
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3854 %% -- print %. %- -- print infinitely many dashes.\n\
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3855 Decimal digits after the % specify field width to which to pad.");
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3856 */
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3857
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3858 DEFVAR_LISP_NOPRO ("default-major-mode", &buffer_defaults.major_mode,
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3859 "*Major mode for new buffers. Defaults to `fundamental-mode'.\n\
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3860 nil here means use current buffer's major mode.");
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3861
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3862 DEFVAR_PER_BUFFER ("major-mode", &current_buffer->major_mode,
1001
c1ebe69206df * buffer.c (syms_of_buffer): Call DEFVAR_PER_BUFFER with the new
Jim Blandy <jimb@redhat.com>
parents: 764
diff changeset
3863 make_number (Lisp_Symbol),
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3864 "Symbol for current buffer's major mode.");
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3865
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3866 DEFVAR_PER_BUFFER ("mode-name", &current_buffer->mode_name,
1001
c1ebe69206df * buffer.c (syms_of_buffer): Call DEFVAR_PER_BUFFER with the new
Jim Blandy <jimb@redhat.com>
parents: 764
diff changeset
3867 make_number (Lisp_String),
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3868 "Pretty name of current buffer's major mode (a string).");
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3869
1001
c1ebe69206df * buffer.c (syms_of_buffer): Call DEFVAR_PER_BUFFER with the new
Jim Blandy <jimb@redhat.com>
parents: 764
diff changeset
3870 DEFVAR_PER_BUFFER ("abbrev-mode", &current_buffer->abbrev_mode, Qnil,
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3871 "Non-nil turns on automatic expansion of abbrevs as they are inserted.\n\
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3872 Automatically becomes buffer-local when set in any fashion.");
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3873
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3874 DEFVAR_PER_BUFFER ("case-fold-search", &current_buffer->case_fold_search,
1001
c1ebe69206df * buffer.c (syms_of_buffer): Call DEFVAR_PER_BUFFER with the new
Jim Blandy <jimb@redhat.com>
parents: 764
diff changeset
3875 Qnil,
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3876 "*Non-nil if searches should ignore case.\n\
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3877 Automatically becomes buffer-local when set in any fashion.");
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3878
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3879 DEFVAR_PER_BUFFER ("fill-column", &current_buffer->fill_column,
1001
c1ebe69206df * buffer.c (syms_of_buffer): Call DEFVAR_PER_BUFFER with the new
Jim Blandy <jimb@redhat.com>
parents: 764
diff changeset
3880 make_number (Lisp_Int),
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3881 "*Column beyond which automatic line-wrapping should happen.\n\
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3882 Automatically becomes buffer-local when set in any fashion.");
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3883
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3884 DEFVAR_PER_BUFFER ("left-margin", &current_buffer->left_margin,
1001
c1ebe69206df * buffer.c (syms_of_buffer): Call DEFVAR_PER_BUFFER with the new
Jim Blandy <jimb@redhat.com>
parents: 764
diff changeset
3885 make_number (Lisp_Int),
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3886 "*Column for the default indent-line-function to indent to.\n\
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3887 Linefeed indents to this column in Fundamental mode.\n\
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3888 Automatically becomes buffer-local when set in any fashion.");
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3889
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3890 DEFVAR_PER_BUFFER ("tab-width", &current_buffer->tab_width,
1001
c1ebe69206df * buffer.c (syms_of_buffer): Call DEFVAR_PER_BUFFER with the new
Jim Blandy <jimb@redhat.com>
parents: 764
diff changeset
3891 make_number (Lisp_Int),
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3892 "*Distance between tab stops (for display of tab characters), in columns.\n\
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3893 Automatically becomes buffer-local when set in any fashion.");
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3894
1001
c1ebe69206df * buffer.c (syms_of_buffer): Call DEFVAR_PER_BUFFER with the new
Jim Blandy <jimb@redhat.com>
parents: 764
diff changeset
3895 DEFVAR_PER_BUFFER ("ctl-arrow", &current_buffer->ctl_arrow, Qnil,
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3896 "*Non-nil means display control chars with uparrow.\n\
18009
7c256846be75 (syms_of_buffer): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 17735
diff changeset
3897 A value of nil means use backslash and octal digits.\n\
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3898 Automatically becomes buffer-local when set in any fashion.\n\
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3899 This variable does not apply to characters whose display is specified\n\
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3900 in the current display table (if there is one).");
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3901
17022
907fb167f7de Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16840
diff changeset
3902 DEFVAR_PER_BUFFER ("enable-multibyte-characters",
907fb167f7de Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16840
diff changeset
3903 &current_buffer->enable_multibyte_characters, Qnil,
907fb167f7de Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16840
diff changeset
3904 "Non-nil means the buffer contents are regarded as multi-byte form\n\
907fb167f7de Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16840
diff changeset
3905 of characters, not a binary code. This affects the display, file I/O,\n\
907fb167f7de Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16840
diff changeset
3906 and behaviors of various editing commands.");
907fb167f7de Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16840
diff changeset
3907
18178
b45b431879bf (init_buffer_once): Inititialize the member
Kenichi Handa <handa@m17n.org>
parents: 18105
diff changeset
3908 DEFVAR_PER_BUFFER ("buffer-file-coding-system",
b45b431879bf (init_buffer_once): Inititialize the member
Kenichi Handa <handa@m17n.org>
parents: 18105
diff changeset
3909 &current_buffer->buffer_file_coding_system, Qnil,
b45b431879bf (init_buffer_once): Inititialize the member
Kenichi Handa <handa@m17n.org>
parents: 18105
diff changeset
3910 "Coding system to be used for encoding the buffer contents on saving.\n\
b45b431879bf (init_buffer_once): Inititialize the member
Kenichi Handa <handa@m17n.org>
parents: 18105
diff changeset
3911 If it is nil, the buffer is saved without any code conversion unless\n\
b45b431879bf (init_buffer_once): Inititialize the member
Kenichi Handa <handa@m17n.org>
parents: 18105
diff changeset
3912 some coding system is specified in file-coding-system-alist\n\
b45b431879bf (init_buffer_once): Inititialize the member
Kenichi Handa <handa@m17n.org>
parents: 18105
diff changeset
3913 for the buffer file.\n\
b45b431879bf (init_buffer_once): Inititialize the member
Kenichi Handa <handa@m17n.org>
parents: 18105
diff changeset
3914 \n\
b45b431879bf (init_buffer_once): Inititialize the member
Kenichi Handa <handa@m17n.org>
parents: 18105
diff changeset
3915 This variable is never applied to a way of decoding\n\
b45b431879bf (init_buffer_once): Inititialize the member
Kenichi Handa <handa@m17n.org>
parents: 18105
diff changeset
3916 a file while reading it.");
b45b431879bf (init_buffer_once): Inititialize the member
Kenichi Handa <handa@m17n.org>
parents: 18105
diff changeset
3917
17022
907fb167f7de Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16840
diff changeset
3918 DEFVAR_PER_BUFFER ("direction-reversed", &current_buffer->direction_reversed,
907fb167f7de Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16840
diff changeset
3919 Qnil,
907fb167f7de Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16840
diff changeset
3920 "*Non-nil means lines in the buffer are displayed right to left.");
907fb167f7de Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16840
diff changeset
3921
1001
c1ebe69206df * buffer.c (syms_of_buffer): Call DEFVAR_PER_BUFFER with the new
Jim Blandy <jimb@redhat.com>
parents: 764
diff changeset
3922 DEFVAR_PER_BUFFER ("truncate-lines", &current_buffer->truncate_lines, Qnil,
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3923 "*Non-nil means do not display continuation lines;\n\
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3924 give each line of text one screen line.\n\
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3925 Automatically becomes buffer-local when set in any fashion.\n\
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3926 \n\
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3927 Note that this is overridden by the variable\n\
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3928 `truncate-partial-width-windows' if that variable is non-nil\n\
764
bb24f1180bb6 entered into RCS
Jim Blandy <jimb@redhat.com>
parents: 739
diff changeset
3929 and this buffer is not full-frame width.");
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3930
9785
a72386110d83 (init_buffer): Use DIRECTORY_SEP, IS_DIRECTORY_SEP macros,
Richard M. Stallman <rms@gnu.org>
parents: 9732
diff changeset
3931 #ifdef DOS_NT
5502
2b48fd9bc80e [MSDOS]: New buffer-local variable:
Richard M. Stallman <rms@gnu.org>
parents: 5433
diff changeset
3932 DEFVAR_PER_BUFFER ("buffer-file-type", &current_buffer->buffer_file_type,
2b48fd9bc80e [MSDOS]: New buffer-local variable:
Richard M. Stallman <rms@gnu.org>
parents: 5433
diff changeset
3933 Qnil,
10253
4aa245b5eb83 (syms_of_buffer): Doc fix for buffer-file-type.
Richard M. Stallman <rms@gnu.org>
parents: 10210
diff changeset
3934 "Non-nil if the visited file is a binary file.\n\
4aa245b5eb83 (syms_of_buffer): Doc fix for buffer-file-type.
Richard M. Stallman <rms@gnu.org>
parents: 10210
diff changeset
3935 This variable is meaningful on MS-DOG and Windows NT.\n\
4aa245b5eb83 (syms_of_buffer): Doc fix for buffer-file-type.
Richard M. Stallman <rms@gnu.org>
parents: 10210
diff changeset
3936 On those systems, it is automatically local in every buffer.\n\
10505
4f7f9b9ff513 (syms_of_buffer) [DOS_NT]: Add missing ';'.
Richard M. Stallman <rms@gnu.org>
parents: 10443
diff changeset
3937 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
3938 #endif
2b48fd9bc80e [MSDOS]: New buffer-local variable:
Richard M. Stallman <rms@gnu.org>
parents: 5433
diff changeset
3939
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3940 DEFVAR_PER_BUFFER ("default-directory", &current_buffer->directory,
1001
c1ebe69206df * buffer.c (syms_of_buffer): Call DEFVAR_PER_BUFFER with the new
Jim Blandy <jimb@redhat.com>
parents: 764
diff changeset
3941 make_number (Lisp_String),
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3942 "Name of default directory of current buffer. Should end with slash.\n\
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3943 Each buffer has its own value of this variable.");
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3944
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3945 DEFVAR_PER_BUFFER ("auto-fill-function", &current_buffer->auto_fill_function,
1001
c1ebe69206df * buffer.c (syms_of_buffer): Call DEFVAR_PER_BUFFER with the new
Jim Blandy <jimb@redhat.com>
parents: 764
diff changeset
3946 Qnil,
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3947 "Function called (if non-nil) to perform auto-fill.\n\
15638
fc00cd5ad30f (syms_of_buffer): Doc fix.
Karl Heuer <kwzh@gnu.org>
parents: 15421
diff changeset
3948 It is called after self-inserting a space or newline.\n\
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3949 Each buffer has its own value of this variable.\n\
15638
fc00cd5ad30f (syms_of_buffer): Doc fix.
Karl Heuer <kwzh@gnu.org>
parents: 15421
diff changeset
3950 NOTE: This variable is not a hook;\n\
fc00cd5ad30f (syms_of_buffer): Doc fix.
Karl Heuer <kwzh@gnu.org>
parents: 15421
diff changeset
3951 its value may not be a list of functions.");
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3952
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3953 DEFVAR_PER_BUFFER ("buffer-file-name", &current_buffer->filename,
1001
c1ebe69206df * buffer.c (syms_of_buffer): Call DEFVAR_PER_BUFFER with the new
Jim Blandy <jimb@redhat.com>
parents: 764
diff changeset
3954 make_number (Lisp_String),
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3955 "Name of file visited in current buffer, or nil if not visiting a file.\n\
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3956 Each buffer has its own value of this variable.");
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3957
10751
dea8f022819d (syms_of_buffer): Set up Lisp var buffer-file-truename.
Richard M. Stallman <rms@gnu.org>
parents: 10668
diff changeset
3958 DEFVAR_PER_BUFFER ("buffer-file-truename", &current_buffer->file_truename,
dea8f022819d (syms_of_buffer): Set up Lisp var buffer-file-truename.
Richard M. Stallman <rms@gnu.org>
parents: 10668
diff changeset
3959 make_number (Lisp_String),
12354
dfcab1d5249d (syms_of_buffer): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 12214
diff changeset
3960 "Abbreviated truename of file visited in current buffer, or nil if none.\n\
11823
51194e0d2967 (syms_of_buffer): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 11693
diff changeset
3961 The truename of a file is calculated by `file-truename'\n\
51194e0d2967 (syms_of_buffer): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 11693
diff changeset
3962 and then abbreviated with `abbreviate-file-name'.\n\
10751
dea8f022819d (syms_of_buffer): Set up Lisp var buffer-file-truename.
Richard M. Stallman <rms@gnu.org>
parents: 10668
diff changeset
3963 Each buffer has its own value of this variable.");
dea8f022819d (syms_of_buffer): Set up Lisp var buffer-file-truename.
Richard M. Stallman <rms@gnu.org>
parents: 10668
diff changeset
3964
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3965 DEFVAR_PER_BUFFER ("buffer-auto-save-file-name",
1041
da04b25b1759 Formatting change
Jim Blandy <jimb@redhat.com>
parents: 1038
diff changeset
3966 &current_buffer->auto_save_file_name,
1001
c1ebe69206df * buffer.c (syms_of_buffer): Call DEFVAR_PER_BUFFER with the new
Jim Blandy <jimb@redhat.com>
parents: 764
diff changeset
3967 make_number (Lisp_String),
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3968 "Name of file for auto-saving current buffer,\n\
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3969 or nil if buffer should not be auto-saved.\n\
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3970 Each buffer has its own value of this variable.");
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3971
1001
c1ebe69206df * buffer.c (syms_of_buffer): Call DEFVAR_PER_BUFFER with the new
Jim Blandy <jimb@redhat.com>
parents: 764
diff changeset
3972 DEFVAR_PER_BUFFER ("buffer-read-only", &current_buffer->read_only, Qnil,
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3973 "Non-nil if this buffer is read-only.\n\
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3974 Each buffer has its own value of this variable.");
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3975
1001
c1ebe69206df * buffer.c (syms_of_buffer): Call DEFVAR_PER_BUFFER with the new
Jim Blandy <jimb@redhat.com>
parents: 764
diff changeset
3976 DEFVAR_PER_BUFFER ("buffer-backed-up", &current_buffer->backed_up, Qnil,
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3977 "Non-nil if this buffer's file has been backed up.\n\
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3978 Backing up is done before the first time the file is saved.\n\
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3979 Each buffer has its own value of this variable.");
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3980
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3981 DEFVAR_PER_BUFFER ("buffer-saved-size", &current_buffer->save_length,
1001
c1ebe69206df * buffer.c (syms_of_buffer): Call DEFVAR_PER_BUFFER with the new
Jim Blandy <jimb@redhat.com>
parents: 764
diff changeset
3982 make_number (Lisp_Int),
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3983 "Length of current buffer when last read in, saved or auto-saved.\n\
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3984 0 initially.\n\
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3985 Each buffer has its own value of this variable.");
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3986
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3987 DEFVAR_PER_BUFFER ("selective-display", &current_buffer->selective_display,
1001
c1ebe69206df * buffer.c (syms_of_buffer): Call DEFVAR_PER_BUFFER with the new
Jim Blandy <jimb@redhat.com>
parents: 764
diff changeset
3988 Qnil,
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3989 "Non-nil enables selective display:\n\
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3990 Integer N as value means display only lines\n\
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3991 that start with less than n columns of space.\n\
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3992 A value of t means, after a ^M, all the rest of the line is invisible.\n\
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3993 Then ^M's in the file are written into files as newlines.\n\n\
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3994 Automatically becomes buffer-local when set in any fashion.");
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3995
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3996 #ifndef old
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3997 DEFVAR_PER_BUFFER ("selective-display-ellipses",
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3998 &current_buffer->selective_display_ellipses,
1001
c1ebe69206df * buffer.c (syms_of_buffer): Call DEFVAR_PER_BUFFER with the new
Jim Blandy <jimb@redhat.com>
parents: 764
diff changeset
3999 Qnil,
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
4000 "t means display ... on previous line when a line is invisible.\n\
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
4001 Automatically becomes buffer-local when set in any fashion.");
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
4002 #endif
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
4003
1001
c1ebe69206df * buffer.c (syms_of_buffer): Call DEFVAR_PER_BUFFER with the new
Jim Blandy <jimb@redhat.com>
parents: 764
diff changeset
4004 DEFVAR_PER_BUFFER ("overwrite-mode", &current_buffer->overwrite_mode, Qnil,
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
4005 "Non-nil if self-insertion should replace existing text.\n\
10611
eafe5efc009b (syms_of_buffer): overwrite-mode doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 10561
diff changeset
4006 The value should be one of `overwrite-mode-textual',\n\
eafe5efc009b (syms_of_buffer): overwrite-mode doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 10561
diff changeset
4007 `overwrite-mode-binary', or nil.\n\
eafe5efc009b (syms_of_buffer): overwrite-mode doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 10561
diff changeset
4008 If it is `overwrite-mode-textual', self-insertion still\n\
2214
e5928bec8d5d * cmds.c (overwrite_binary_mode): Deleted; this implements the
Jim Blandy <jimb@redhat.com>
parents: 2060
diff changeset
4009 inserts at the end of a line, and inserts when point is before a tab,\n\
2217
f650efceb0fb Doc fix.
Jim Blandy <jimb@redhat.com>
parents: 2214
diff changeset
4010 until the tab is filled in.\n\
2214
e5928bec8d5d * cmds.c (overwrite_binary_mode): Deleted; this implements the
Jim Blandy <jimb@redhat.com>
parents: 2060
diff changeset
4011 If `overwrite-mode-binary', self-insertion replaces newlines and tabs too.\n\
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
4012 Automatically becomes buffer-local when set in any fashion.");
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
4013
4226
7c7e33d6386d (syms_of_buffer): Lisp var doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 4213
diff changeset
4014 #if 0 /* The doc string is too long for some compilers,
7c7e33d6386d (syms_of_buffer): Lisp var doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 4213
diff changeset
4015 but make-docfile can find it in this comment. */
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
4016 DEFVAR_PER_BUFFER ("buffer-display-table", &current_buffer->display_table,
1038
59fa7697bb14 (syms_of_buffer): Made buffer-display-table,
Richard M. Stallman <rms@gnu.org>
parents: 1001
diff changeset
4017 Qnil,
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
4018 "Display table that controls display of the contents of current buffer.\n\
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
4019 Automatically becomes buffer-local when set in any fashion.\n\
13169
d72f18f068a8 (buffer-display-table): Document new implementation.
Erik Naggum <erik@naggum.no>
parents: 13151
diff changeset
4020 The display table is a char-table created with `make-display-table'.\n\
d72f18f068a8 (buffer-display-table): Document new implementation.
Erik Naggum <erik@naggum.no>
parents: 13151
diff changeset
4021 The ordinary char-table elements control how to display each possible text\n\
d72f18f068a8 (buffer-display-table): Document new implementation.
Erik Naggum <erik@naggum.no>
parents: 13151
diff changeset
4022 character. Each value should be a vector of characters or nil;\n\
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
4023 nil means display the character in the default fashion.\n\
13169
d72f18f068a8 (buffer-display-table): Document new implementation.
Erik Naggum <erik@naggum.no>
parents: 13151
diff changeset
4024 There are six extra slots to control the display of\n\
d72f18f068a8 (buffer-display-table): Document new implementation.
Erik Naggum <erik@naggum.no>
parents: 13151
diff changeset
4025 the end of a truncated screen line (extra-slot 0, a single character);\n\
d72f18f068a8 (buffer-display-table): Document new implementation.
Erik Naggum <erik@naggum.no>
parents: 13151
diff changeset
4026 the end of a continued line (extra-slot 1, a single character);\n\
2645
b0462d46afff * buffer.c (syms_of_buffer): Doc fix for buffer-display-table.
Jim Blandy <jimb@redhat.com>
parents: 2578
diff changeset
4027 the escape character used to display character codes in octal\n\
13169
d72f18f068a8 (buffer-display-table): Document new implementation.
Erik Naggum <erik@naggum.no>
parents: 13151
diff changeset
4028 (extra-slot 2, a single character);\n\
d72f18f068a8 (buffer-display-table): Document new implementation.
Erik Naggum <erik@naggum.no>
parents: 13151
diff changeset
4029 the character used as an arrow for control characters (extra-slot 3,\n\
2645
b0462d46afff * buffer.c (syms_of_buffer): Doc fix for buffer-display-table.
Jim Blandy <jimb@redhat.com>
parents: 2578
diff changeset
4030 a single character);\n\
13169
d72f18f068a8 (buffer-display-table): Document new implementation.
Erik Naggum <erik@naggum.no>
parents: 13151
diff changeset
4031 the decoration indicating the presence of invisible lines (extra-slot 4,\n\
8919
644f69fe736e Add a new element to display tables controlling side-by-side
Jim Blandy <jimb@redhat.com>
parents: 8873
diff changeset
4032 a vector of characters);\n\
644f69fe736e Add a new element to display tables controlling side-by-side
Jim Blandy <jimb@redhat.com>
parents: 8873
diff changeset
4033 the character used to draw the border between side-by-side windows\n\
13169
d72f18f068a8 (buffer-display-table): Document new implementation.
Erik Naggum <erik@naggum.no>
parents: 13151
diff changeset
4034 (extra-slot 5, a single character).\n\
d72f18f068a8 (buffer-display-table): Document new implementation.
Erik Naggum <erik@naggum.no>
parents: 13151
diff changeset
4035 See also the functions `display-table-slot' and `set-display-table-slot'.\n\
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
4036 If this variable is nil, the value of `standard-display-table' is used.\n\
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
4037 Each window can have its own, overriding display table.");
4226
7c7e33d6386d (syms_of_buffer): Lisp var doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 4213
diff changeset
4038 #endif
7c7e33d6386d (syms_of_buffer): Lisp var doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 4213
diff changeset
4039 DEFVAR_PER_BUFFER ("buffer-display-table", &current_buffer->display_table,
6348
f5a437637850 (buffer-display-table, buffer-undo-list): Delete docstring of second version
Karl Heuer <kwzh@gnu.org>
parents: 6205
diff changeset
4040 Qnil, 0);
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
4041
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
4042 /*DEFVAR_LISP ("debug-check-symbol", &Vcheck_symbol,
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
4043 "Don't ask.");
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
4044 */
392
dce611246f59 *** empty log message ***
Roland McGrath <roland@gnu.org>
parents: 333
diff changeset
4045 DEFVAR_LISP ("before-change-function", &Vbefore_change_function,
16144
2ca3765fdc00 (syms_of_buffer): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 16067
diff changeset
4046 "If non-nil, a function to call before each text change (obsolete).\n\
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
4047 Two arguments are passed to the function: the positions of\n\
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
4048 the beginning and end of the range of old text to be changed.\n\
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
4049 \(For an insertion, the beginning and end are at the same place.)\n\
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
4050 No information is given about the length of the text after the change.\n\
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
4051 \n\
6785
121f2c5eba5e (Vafter_change_functions, Vbefore_change_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 6697
diff changeset
4052 Buffer changes made while executing the `before-change-function'\n\
7434
7b5d67590d57 (Qbuffer_file_type): Var deleted.
Richard M. Stallman <rms@gnu.org>
parents: 7295
diff changeset
4053 don't call any before-change or after-change functions.\n\
7b5d67590d57 (Qbuffer_file_type): Var deleted.
Richard M. Stallman <rms@gnu.org>
parents: 7295
diff changeset
4054 That's because these variables are temporarily set to nil.\n\
7b5d67590d57 (Qbuffer_file_type): Var deleted.
Richard M. Stallman <rms@gnu.org>
parents: 7295
diff changeset
4055 As a result, a hook function cannot straightforwardly alter the value of\n\
7b5d67590d57 (Qbuffer_file_type): Var deleted.
Richard M. Stallman <rms@gnu.org>
parents: 7295
diff changeset
4056 these variables. See the Emacs Lisp manual for a way of\n\
16144
2ca3765fdc00 (syms_of_buffer): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 16067
diff changeset
4057 accomplishing an equivalent result by using other variables.\n\n\
2ca3765fdc00 (syms_of_buffer): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 16067
diff changeset
4058 This variable is obsolete; use `before-change-functions' instead.");
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
4059 Vbefore_change_function = Qnil;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
4060
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
4061 DEFVAR_LISP ("after-change-function", &Vafter_change_function,
16144
2ca3765fdc00 (syms_of_buffer): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 16067
diff changeset
4062 "If non-nil, a Function to call after each text change (obsolete).\n\
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
4063 Three arguments are passed to the function: the positions of\n\
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
4064 the beginning and end of the range of changed text,\n\
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
4065 and the length of the pre-change text replaced by that range.\n\
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
4066 \(For an insertion, the pre-change length is zero;\n\
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
4067 for a deletion, that length is the number of characters deleted,\n\
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
4068 and the post-change beginning and end are at the same place.)\n\
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
4069 \n\
6785
121f2c5eba5e (Vafter_change_functions, Vbefore_change_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 6697
diff changeset
4070 Buffer changes made while executing the `after-change-function'\n\
7434
7b5d67590d57 (Qbuffer_file_type): Var deleted.
Richard M. Stallman <rms@gnu.org>
parents: 7295
diff changeset
4071 don't call any before-change or after-change functions.\n\
7b5d67590d57 (Qbuffer_file_type): Var deleted.
Richard M. Stallman <rms@gnu.org>
parents: 7295
diff changeset
4072 That's because these variables are temporarily set to nil.\n\
7b5d67590d57 (Qbuffer_file_type): Var deleted.
Richard M. Stallman <rms@gnu.org>
parents: 7295
diff changeset
4073 As a result, a hook function cannot straightforwardly alter the value of\n\
7b5d67590d57 (Qbuffer_file_type): Var deleted.
Richard M. Stallman <rms@gnu.org>
parents: 7295
diff changeset
4074 these variables. See the Emacs Lisp manual for a way of\n\
16144
2ca3765fdc00 (syms_of_buffer): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 16067
diff changeset
4075 accomplishing an equivalent result by using other variables.\n\n\
2ca3765fdc00 (syms_of_buffer): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 16067
diff changeset
4076 This variable is obsolete; use `after-change-functions' instead.");
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
4077 Vafter_change_function = Qnil;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
4078
6785
121f2c5eba5e (Vafter_change_functions, Vbefore_change_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 6697
diff changeset
4079 DEFVAR_LISP ("before-change-functions", &Vbefore_change_functions,
121f2c5eba5e (Vafter_change_functions, Vbefore_change_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 6697
diff changeset
4080 "List of functions to call before each text change.\n\
121f2c5eba5e (Vafter_change_functions, Vbefore_change_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 6697
diff changeset
4081 Two arguments are passed to each function: the positions of\n\
121f2c5eba5e (Vafter_change_functions, Vbefore_change_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 6697
diff changeset
4082 the beginning and end of the range of old text to be changed.\n\
121f2c5eba5e (Vafter_change_functions, Vbefore_change_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 6697
diff changeset
4083 \(For an insertion, the beginning and end are at the same place.)\n\
121f2c5eba5e (Vafter_change_functions, Vbefore_change_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 6697
diff changeset
4084 No information is given about the length of the text after the change.\n\
121f2c5eba5e (Vafter_change_functions, Vbefore_change_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 6697
diff changeset
4085 \n\
121f2c5eba5e (Vafter_change_functions, Vbefore_change_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 6697
diff changeset
4086 Buffer changes made while executing the `before-change-functions'\n\
7434
7b5d67590d57 (Qbuffer_file_type): Var deleted.
Richard M. Stallman <rms@gnu.org>
parents: 7295
diff changeset
4087 don't call any before-change or after-change functions.\n\
7b5d67590d57 (Qbuffer_file_type): Var deleted.
Richard M. Stallman <rms@gnu.org>
parents: 7295
diff changeset
4088 That's because these variables are temporarily set to nil.\n\
7b5d67590d57 (Qbuffer_file_type): Var deleted.
Richard M. Stallman <rms@gnu.org>
parents: 7295
diff changeset
4089 As a result, a hook function cannot straightforwardly alter the value of\n\
7b5d67590d57 (Qbuffer_file_type): Var deleted.
Richard M. Stallman <rms@gnu.org>
parents: 7295
diff changeset
4090 these variables. See the Emacs Lisp manual for a way of\n\
7455
35657813817c (Frename_buffer): Reject empty string as new name.
Richard M. Stallman <rms@gnu.org>
parents: 7434
diff changeset
4091 accomplishing an equivalent result by using other variables.");
6785
121f2c5eba5e (Vafter_change_functions, Vbefore_change_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 6697
diff changeset
4092 Vbefore_change_functions = Qnil;
121f2c5eba5e (Vafter_change_functions, Vbefore_change_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 6697
diff changeset
4093
121f2c5eba5e (Vafter_change_functions, Vbefore_change_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 6697
diff changeset
4094 DEFVAR_LISP ("after-change-functions", &Vafter_change_functions,
121f2c5eba5e (Vafter_change_functions, Vbefore_change_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 6697
diff changeset
4095 "List of function to call after each text change.\n\
121f2c5eba5e (Vafter_change_functions, Vbefore_change_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 6697
diff changeset
4096 Three arguments are passed to each function: the positions of\n\
121f2c5eba5e (Vafter_change_functions, Vbefore_change_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 6697
diff changeset
4097 the beginning and end of the range of changed text,\n\
121f2c5eba5e (Vafter_change_functions, Vbefore_change_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 6697
diff changeset
4098 and the length of the pre-change text replaced by that range.\n\
121f2c5eba5e (Vafter_change_functions, Vbefore_change_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 6697
diff changeset
4099 \(For an insertion, the pre-change length is zero;\n\
121f2c5eba5e (Vafter_change_functions, Vbefore_change_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 6697
diff changeset
4100 for a deletion, that length is the number of characters deleted,\n\
121f2c5eba5e (Vafter_change_functions, Vbefore_change_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 6697
diff changeset
4101 and the post-change beginning and end are at the same place.)\n\
121f2c5eba5e (Vafter_change_functions, Vbefore_change_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 6697
diff changeset
4102 \n\
121f2c5eba5e (Vafter_change_functions, Vbefore_change_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 6697
diff changeset
4103 Buffer changes made while executing the `after-change-functions'\n\
7434
7b5d67590d57 (Qbuffer_file_type): Var deleted.
Richard M. Stallman <rms@gnu.org>
parents: 7295
diff changeset
4104 don't call any before-change or after-change functions.\n\
7b5d67590d57 (Qbuffer_file_type): Var deleted.
Richard M. Stallman <rms@gnu.org>
parents: 7295
diff changeset
4105 That's because these variables are temporarily set to nil.\n\
7b5d67590d57 (Qbuffer_file_type): Var deleted.
Richard M. Stallman <rms@gnu.org>
parents: 7295
diff changeset
4106 As a result, a hook function cannot straightforwardly alter the value of\n\
7b5d67590d57 (Qbuffer_file_type): Var deleted.
Richard M. Stallman <rms@gnu.org>
parents: 7295
diff changeset
4107 these variables. See the Emacs Lisp manual for a way of\n\
7455
35657813817c (Frename_buffer): Reject empty string as new name.
Richard M. Stallman <rms@gnu.org>
parents: 7434
diff changeset
4108 accomplishing an equivalent result by using other variables.");
7434
7b5d67590d57 (Qbuffer_file_type): Var deleted.
Richard M. Stallman <rms@gnu.org>
parents: 7295
diff changeset
4109
6785
121f2c5eba5e (Vafter_change_functions, Vbefore_change_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 6697
diff changeset
4110 Vafter_change_functions = Qnil;
121f2c5eba5e (Vafter_change_functions, Vbefore_change_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 6697
diff changeset
4111
1821
04fb1d3d6992 JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents: 1707
diff changeset
4112 DEFVAR_LISP ("first-change-hook", &Vfirst_change_hook,
04fb1d3d6992 JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents: 1707
diff changeset
4113 "A list of functions to call before changing a buffer which is unmodified.\n\
04fb1d3d6992 JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents: 1707
diff changeset
4114 The functions are run using the `run-hooks' function.");
04fb1d3d6992 JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents: 1707
diff changeset
4115 Vfirst_change_hook = Qnil;
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
4116
4226
7c7e33d6386d (syms_of_buffer): Lisp var doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 4213
diff changeset
4117 #if 0 /* The doc string is too long for some compilers,
7c7e33d6386d (syms_of_buffer): Lisp var doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 4213
diff changeset
4118 but make-docfile can find it in this comment. */
1041
da04b25b1759 Formatting change
Jim Blandy <jimb@redhat.com>
parents: 1038
diff changeset
4119 DEFVAR_PER_BUFFER ("buffer-undo-list", &current_buffer->undo_list, Qnil,
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
4120 "List of undo entries in current buffer.\n\
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
4121 Recent changes come first; older changes follow newer.\n\
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
4122 \n\
12101
30adadd79bf9 Doc fix.
Karl Heuer <kwzh@gnu.org>
parents: 12076
diff changeset
4123 An entry (BEG . END) represents an insertion which begins at\n\
30adadd79bf9 Doc fix.
Karl Heuer <kwzh@gnu.org>
parents: 12076
diff changeset
4124 position BEG and ends at position END.\n\
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
4125 \n\
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
4126 An entry (TEXT . POSITION) represents the deletion of the string TEXT\n\
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
4127 from (abs POSITION). If POSITION is positive, point was at the front\n\
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
4128 of the text being deleted; if negative, point was at the end.\n\
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
4129 \n\
10365
3a50d7d3ae47 (syms_of_buffer): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 10314
diff changeset
4130 An entry (t HIGH . LOW) indicates that the buffer previously had\n\
3a50d7d3ae47 (syms_of_buffer): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 10314
diff changeset
4131 \"unmodified\" status. HIGH and LOW are the high and low 16-bit portions\n\
3a50d7d3ae47 (syms_of_buffer): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 10314
diff changeset
4132 of the visited file's modification time, as of that time. If the\n\
3a50d7d3ae47 (syms_of_buffer): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 10314
diff changeset
4133 modification time of the most recent save is different, this entry is\n\
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
4134 obsolete.\n\
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
4135 \n\
10365
3a50d7d3ae47 (syms_of_buffer): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 10314
diff changeset
4136 An entry (nil PROPERTY VALUE BEG . END) indicates that a text property\n\
3a50d7d3ae47 (syms_of_buffer): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 10314
diff changeset
4137 was modified between BEG and END. PROPERTY is the property name,\n\
3a50d7d3ae47 (syms_of_buffer): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 10314
diff changeset
4138 and VALUE is the old value.\n\
1952
b0ec61f76511 (syms_of_buffer): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 1909
diff changeset
4139 \n\
14481
9785f1180901 (syms_of_buffer): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 14396
diff changeset
4140 An entry (MARKER . DISTANCE) indicates that the marker MARKER\n\
9785f1180901 (syms_of_buffer): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 14396
diff changeset
4141 was adjusted in position by the offset DISTANCE (an integer).\n\
9785f1180901 (syms_of_buffer): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 14396
diff changeset
4142 \n\
1985
666e3f26a8d6 * buffer.c (buffer-undo-list): Doc fix.
Jim Blandy <jimb@redhat.com>
parents: 1953
diff changeset
4143 An entry of the form POSITION indicates that point was at the buffer\n\
666e3f26a8d6 * buffer.c (buffer-undo-list): Doc fix.
Jim Blandy <jimb@redhat.com>
parents: 1953
diff changeset
4144 location given by the integer. Undoing an entry of this form places\n\
666e3f26a8d6 * buffer.c (buffer-undo-list): Doc fix.
Jim Blandy <jimb@redhat.com>
parents: 1953
diff changeset
4145 point at POSITION.\n\
666e3f26a8d6 * buffer.c (buffer-undo-list): Doc fix.
Jim Blandy <jimb@redhat.com>
parents: 1953
diff changeset
4146 \n\
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
4147 nil marks undo boundaries. The undo command treats the changes\n\
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
4148 between two undo boundaries as a single step to be undone.\n\
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
4149 \n\
1985
666e3f26a8d6 * buffer.c (buffer-undo-list): Doc fix.
Jim Blandy <jimb@redhat.com>
parents: 1953
diff changeset
4150 If the value of the variable is t, undo information is not recorded.");
4226
7c7e33d6386d (syms_of_buffer): Lisp var doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 4213
diff changeset
4151 #endif
7c7e33d6386d (syms_of_buffer): Lisp var doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 4213
diff changeset
4152 DEFVAR_PER_BUFFER ("buffer-undo-list", &current_buffer->undo_list, Qnil,
6348
f5a437637850 (buffer-display-table, buffer-undo-list): Delete docstring of second version
Karl Heuer <kwzh@gnu.org>
parents: 6205
diff changeset
4153 0);
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
4154
2043
a1ab3501653c (reset_buffer_local_variables): Reset mark_active.
Richard M. Stallman <rms@gnu.org>
parents: 2020
diff changeset
4155 DEFVAR_PER_BUFFER ("mark-active", &current_buffer->mark_active, Qnil,
a1ab3501653c (reset_buffer_local_variables): Reset mark_active.
Richard M. Stallman <rms@gnu.org>
parents: 2020
diff changeset
4156 "Non-nil means the mark and region are currently active in this buffer.\n\
a1ab3501653c (reset_buffer_local_variables): Reset mark_active.
Richard M. Stallman <rms@gnu.org>
parents: 2020
diff changeset
4157 Automatically local in all buffers.");
a1ab3501653c (reset_buffer_local_variables): Reset mark_active.
Richard M. Stallman <rms@gnu.org>
parents: 2020
diff changeset
4158
9403
9f797989b817 * buffer.c: #include region-cache.h.
Jim Blandy <jimb@redhat.com>
parents: 9362
diff changeset
4159 DEFVAR_PER_BUFFER ("cache-long-line-scans", &current_buffer->cache_long_line_scans, Qnil,
9419
b429144f6ace (syms_of_buffer): Doc fix for cache-long-line-scans.
Jim Blandy <jimb@redhat.com>
parents: 9403
diff changeset
4160 "Non-nil means that Emacs should use caches to handle long lines more quickly.\n\
b429144f6ace (syms_of_buffer): Doc fix for cache-long-line-scans.
Jim Blandy <jimb@redhat.com>
parents: 9403
diff changeset
4161 This variable is buffer-local, in all buffers.\n\
9403
9f797989b817 * buffer.c: #include region-cache.h.
Jim Blandy <jimb@redhat.com>
parents: 9362
diff changeset
4162 \n\
9419
b429144f6ace (syms_of_buffer): Doc fix for cache-long-line-scans.
Jim Blandy <jimb@redhat.com>
parents: 9403
diff changeset
4163 Normally, the line-motion functions work by scanning the buffer for\n\
b429144f6ace (syms_of_buffer): Doc fix for cache-long-line-scans.
Jim Blandy <jimb@redhat.com>
parents: 9403
diff changeset
4164 newlines. Columnar operations (like move-to-column and\n\
b429144f6ace (syms_of_buffer): Doc fix for cache-long-line-scans.
Jim Blandy <jimb@redhat.com>
parents: 9403
diff changeset
4165 compute-motion) also work by scanning the buffer, summing character\n\
b429144f6ace (syms_of_buffer): Doc fix for cache-long-line-scans.
Jim Blandy <jimb@redhat.com>
parents: 9403
diff changeset
4166 widths as they go. This works well for ordinary text, but if the\n\
9403
9f797989b817 * buffer.c: #include region-cache.h.
Jim Blandy <jimb@redhat.com>
parents: 9362
diff changeset
4167 buffer's lines are very long (say, more than 500 characters), these\n\
9419
b429144f6ace (syms_of_buffer): Doc fix for cache-long-line-scans.
Jim Blandy <jimb@redhat.com>
parents: 9403
diff changeset
4168 motion functions will take longer to execute. Emacs may also take\n\
b429144f6ace (syms_of_buffer): Doc fix for cache-long-line-scans.
Jim Blandy <jimb@redhat.com>
parents: 9403
diff changeset
4169 longer to update the display.\n\
9403
9f797989b817 * buffer.c: #include region-cache.h.
Jim Blandy <jimb@redhat.com>
parents: 9362
diff changeset
4170 \n\
9419
b429144f6ace (syms_of_buffer): Doc fix for cache-long-line-scans.
Jim Blandy <jimb@redhat.com>
parents: 9403
diff changeset
4171 If cache-long-line-scans is non-nil, these motion functions cache the\n\
b429144f6ace (syms_of_buffer): Doc fix for cache-long-line-scans.
Jim Blandy <jimb@redhat.com>
parents: 9403
diff changeset
4172 results of their scans, and consult the cache to avoid rescanning\n\
b429144f6ace (syms_of_buffer): Doc fix for cache-long-line-scans.
Jim Blandy <jimb@redhat.com>
parents: 9403
diff changeset
4173 regions of the buffer until the text is modified. The caches are most\n\
b429144f6ace (syms_of_buffer): Doc fix for cache-long-line-scans.
Jim Blandy <jimb@redhat.com>
parents: 9403
diff changeset
4174 beneficial when they prevent the most searching---that is, when the\n\
b429144f6ace (syms_of_buffer): Doc fix for cache-long-line-scans.
Jim Blandy <jimb@redhat.com>
parents: 9403
diff changeset
4175 buffer contains long lines and large regions of characters with the\n\
b429144f6ace (syms_of_buffer): Doc fix for cache-long-line-scans.
Jim Blandy <jimb@redhat.com>
parents: 9403
diff changeset
4176 same, fixed screen width.\n\
9403
9f797989b817 * buffer.c: #include region-cache.h.
Jim Blandy <jimb@redhat.com>
parents: 9362
diff changeset
4177 \n\
9419
b429144f6ace (syms_of_buffer): Doc fix for cache-long-line-scans.
Jim Blandy <jimb@redhat.com>
parents: 9403
diff changeset
4178 When cache-long-line-scans is non-nil, processing short lines will\n\
b429144f6ace (syms_of_buffer): Doc fix for cache-long-line-scans.
Jim Blandy <jimb@redhat.com>
parents: 9403
diff changeset
4179 become slightly slower (because of the overhead of consulting the\n\
b429144f6ace (syms_of_buffer): Doc fix for cache-long-line-scans.
Jim Blandy <jimb@redhat.com>
parents: 9403
diff changeset
4180 cache), and the caches will use memory roughly proportional to the\n\
b429144f6ace (syms_of_buffer): Doc fix for cache-long-line-scans.
Jim Blandy <jimb@redhat.com>
parents: 9403
diff changeset
4181 number of newlines and characters whose screen width varies.\n\
b429144f6ace (syms_of_buffer): Doc fix for cache-long-line-scans.
Jim Blandy <jimb@redhat.com>
parents: 9403
diff changeset
4182 \n\
b429144f6ace (syms_of_buffer): Doc fix for cache-long-line-scans.
Jim Blandy <jimb@redhat.com>
parents: 9403
diff changeset
4183 The caches require no explicit maintenance; their accuracy is\n\
b429144f6ace (syms_of_buffer): Doc fix for cache-long-line-scans.
Jim Blandy <jimb@redhat.com>
parents: 9403
diff changeset
4184 maintained internally by the Emacs primitives. Enabling or disabling\n\
b429144f6ace (syms_of_buffer): Doc fix for cache-long-line-scans.
Jim Blandy <jimb@redhat.com>
parents: 9403
diff changeset
4185 the cache should not affect the behavior of any of the motion\n\
b429144f6ace (syms_of_buffer): Doc fix for cache-long-line-scans.
Jim Blandy <jimb@redhat.com>
parents: 9403
diff changeset
4186 functions; it should only affect their performance.");
9403
9f797989b817 * buffer.c: #include region-cache.h.
Jim Blandy <jimb@redhat.com>
parents: 9362
diff changeset
4187
10561
53f34c870201 (init_buffer_once, syms_of_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 10505
diff changeset
4188 DEFVAR_PER_BUFFER ("point-before-scroll", &current_buffer->point_before_scroll, Qnil,
53f34c870201 (init_buffer_once, syms_of_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 10505
diff changeset
4189 "Value of point before the last series of scroll operations, or nil.");
53f34c870201 (init_buffer_once, syms_of_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 10505
diff changeset
4190
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
4191 DEFVAR_PER_BUFFER ("buffer-file-format", &current_buffer->file_format, Qnil,
35664a2851e7 (reset_buffer): Reset file_format element too.(init_buffer_once): Define file_format flag; reset file_format.
Boris Goldowsky <boris@gnu.org>
parents: 11000
diff changeset
4192 "List of formats to use when saving this buffer.\n\
35664a2851e7 (reset_buffer): Reset file_format element too.(init_buffer_once): Define file_format flag; reset file_format.
Boris Goldowsky <boris@gnu.org>
parents: 11000
diff changeset
4193 Formats are defined by `format-alist'. This variable is\n\
35664a2851e7 (reset_buffer): Reset file_format element too.(init_buffer_once): Define file_format flag; reset file_format.
Boris Goldowsky <boris@gnu.org>
parents: 11000
diff changeset
4194 set when a file is visited. Automatically local in all buffers.");
35664a2851e7 (reset_buffer): Reset file_format element too.(init_buffer_once): Define file_format flag; reset file_format.
Boris Goldowsky <boris@gnu.org>
parents: 11000
diff changeset
4195
10967
b53b84b6f46d (reset_buffer_local_variables): Init invisibility.
Richard M. Stallman <rms@gnu.org>
parents: 10916
diff changeset
4196 DEFVAR_PER_BUFFER ("buffer-invisibility-spec",
b53b84b6f46d (reset_buffer_local_variables): Init invisibility.
Richard M. Stallman <rms@gnu.org>
parents: 10916
diff changeset
4197 &current_buffer->invisibility_spec, Qnil,
b53b84b6f46d (reset_buffer_local_variables): Init invisibility.
Richard M. Stallman <rms@gnu.org>
parents: 10916
diff changeset
4198 "Invisibility spec of this buffer.\n\
b53b84b6f46d (reset_buffer_local_variables): Init invisibility.
Richard M. Stallman <rms@gnu.org>
parents: 10916
diff changeset
4199 The default is t, which means that text is invisible\n\
b53b84b6f46d (reset_buffer_local_variables): Init invisibility.
Richard M. Stallman <rms@gnu.org>
parents: 10916
diff changeset
4200 if it has a non-nil `invisible' property.\n\
b53b84b6f46d (reset_buffer_local_variables): Init invisibility.
Richard M. Stallman <rms@gnu.org>
parents: 10916
diff changeset
4201 If the value is a list, a text character is invisible if its `invisible'\n\
b53b84b6f46d (reset_buffer_local_variables): Init invisibility.
Richard M. Stallman <rms@gnu.org>
parents: 10916
diff changeset
4202 property is an element in that list.\n\
11112
20ff2eaa8bf8 (syms_of_buffer): Doc fix.
Karl Heuer <kwzh@gnu.org>
parents: 11097
diff changeset
4203 If an element is a cons cell of the form (PROP . ELLIPSIS),\n\
20ff2eaa8bf8 (syms_of_buffer): Doc fix.
Karl Heuer <kwzh@gnu.org>
parents: 11097
diff changeset
4204 then characters with property value PROP are invisible,\n\
10967
b53b84b6f46d (reset_buffer_local_variables): Init invisibility.
Richard M. Stallman <rms@gnu.org>
parents: 10916
diff changeset
4205 and they have an ellipsis as well if ELLIPSIS is non-nil.");
b53b84b6f46d (reset_buffer_local_variables): Init invisibility.
Richard M. Stallman <rms@gnu.org>
parents: 10916
diff changeset
4206
17218
a57ca25e9c62 (reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents: 17124
diff changeset
4207 DEFVAR_PER_BUFFER ("buffer-display-count",
a57ca25e9c62 (reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents: 17124
diff changeset
4208 &current_buffer->display_count, Qnil,
a57ca25e9c62 (reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents: 17124
diff changeset
4209 "A number incremented each time the buffer is displayed in a window.");
a57ca25e9c62 (reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents: 17124
diff changeset
4210
2043
a1ab3501653c (reset_buffer_local_variables): Reset mark_active.
Richard M. Stallman <rms@gnu.org>
parents: 2020
diff changeset
4211 DEFVAR_LISP ("transient-mark-mode", &Vtransient_mark_mode,
16665
195f7cf6a9f3 (syms_of_buffer): Doc fix (transient-mark-mode).
Richard M. Stallman <rms@gnu.org>
parents: 16384
diff changeset
4212 "*Non-nil means deactivate the mark when the buffer contents change.\n\
195f7cf6a9f3 (syms_of_buffer): Doc fix (transient-mark-mode).
Richard M. Stallman <rms@gnu.org>
parents: 16384
diff changeset
4213 Non-nil also enables highlighting of the region whenever the mark is active.\n\
195f7cf6a9f3 (syms_of_buffer): Doc fix (transient-mark-mode).
Richard M. Stallman <rms@gnu.org>
parents: 16384
diff changeset
4214 The variable `highlight-nonselected-windows' controls whether to highlight\n\
195f7cf6a9f3 (syms_of_buffer): Doc fix (transient-mark-mode).
Richard M. Stallman <rms@gnu.org>
parents: 16384
diff changeset
4215 all windows or just the selected window.");
2043
a1ab3501653c (reset_buffer_local_variables): Reset mark_active.
Richard M. Stallman <rms@gnu.org>
parents: 2020
diff changeset
4216 Vtransient_mark_mode = Qnil;
a1ab3501653c (reset_buffer_local_variables): Reset mark_active.
Richard M. Stallman <rms@gnu.org>
parents: 2020
diff changeset
4217
3533
78b4e6241f85 (Fdelete_overlay): Do nothing if overlay already deleted.
Richard M. Stallman <rms@gnu.org>
parents: 3481
diff changeset
4218 DEFVAR_LISP ("inhibit-read-only", &Vinhibit_read_only,
3481
56424e6245c2 (syms_of_buffer): Set up Lisp var inhibit-read-only.
Richard M. Stallman <rms@gnu.org>
parents: 3463
diff changeset
4219 "*Non-nil means disregard read-only status of buffers or characters.\n\
56424e6245c2 (syms_of_buffer): Set up Lisp var inhibit-read-only.
Richard M. Stallman <rms@gnu.org>
parents: 3463
diff changeset
4220 If the value is t, disregard `buffer-read-only' and all `read-only'\n\
56424e6245c2 (syms_of_buffer): Set up Lisp var inhibit-read-only.
Richard M. Stallman <rms@gnu.org>
parents: 3463
diff changeset
4221 text properties. If the value is a list, disregard `buffer-read-only'\n\
56424e6245c2 (syms_of_buffer): Set up Lisp var inhibit-read-only.
Richard M. Stallman <rms@gnu.org>
parents: 3463
diff changeset
4222 and disregard a `read-only' text property if the property value\n\
56424e6245c2 (syms_of_buffer): Set up Lisp var inhibit-read-only.
Richard M. Stallman <rms@gnu.org>
parents: 3463
diff changeset
4223 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
4224 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
4225
6051
0b144d967f30 (Fkill_buffer): Call the Vkill_buffer_query_functions.
Richard M. Stallman <rms@gnu.org>
parents: 5904
diff changeset
4226 DEFVAR_LISP ("kill-buffer-query-functions", &Vkill_buffer_query_functions,
0b144d967f30 (Fkill_buffer): Call the Vkill_buffer_query_functions.
Richard M. Stallman <rms@gnu.org>
parents: 5904
diff changeset
4227 "List of functions called with no args to query before killing a buffer.");
0b144d967f30 (Fkill_buffer): Call the Vkill_buffer_query_functions.
Richard M. Stallman <rms@gnu.org>
parents: 5904
diff changeset
4228 Vkill_buffer_query_functions = Qnil;
0b144d967f30 (Fkill_buffer): Call the Vkill_buffer_query_functions.
Richard M. Stallman <rms@gnu.org>
parents: 5904
diff changeset
4229
14506
bddd8114eaa9 (Fbuffer_live_p): New function.
Richard M. Stallman <rms@gnu.org>
parents: 14481
diff changeset
4230 defsubr (&Sbuffer_live_p);
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
4231 defsubr (&Sbuffer_list);
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
4232 defsubr (&Sget_buffer);
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
4233 defsubr (&Sget_file_buffer);
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
4234 defsubr (&Sget_buffer_create);
10314
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
4235 defsubr (&Smake_indirect_buffer);
392
dce611246f59 *** empty log message ***
Roland McGrath <roland@gnu.org>
parents: 333
diff changeset
4236 defsubr (&Sgenerate_new_buffer_name);
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
4237 defsubr (&Sbuffer_name);
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
4238 /*defsubr (&Sbuffer_number);*/
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
4239 defsubr (&Sbuffer_file_name);
10314
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
4240 defsubr (&Sbuffer_base_buffer);
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
4241 defsubr (&Sbuffer_local_variables);
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
4242 defsubr (&Sbuffer_modified_p);
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
4243 defsubr (&Sset_buffer_modified_p);
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
4244 defsubr (&Sbuffer_modified_tick);
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
4245 defsubr (&Srename_buffer);
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
4246 defsubr (&Sother_buffer);
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
4247 defsubr (&Sbuffer_disable_undo);
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
4248 defsubr (&Sbuffer_enable_undo);
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
4249 defsubr (&Skill_buffer);
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
4250 defsubr (&Serase_buffer);
9732
577db538b0b6 (Fset_buffer_major_mode): New function. Set the default major mode here.
Karl Heuer <kwzh@gnu.org>
parents: 9632
diff changeset
4251 defsubr (&Sset_buffer_major_mode);
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
4252 defsubr (&Sswitch_to_buffer);
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
4253 defsubr (&Spop_to_buffer);
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
4254 defsubr (&Scurrent_buffer);
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
4255 defsubr (&Sset_buffer);
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
4256 defsubr (&Sbarf_if_buffer_read_only);
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
4257 defsubr (&Sbury_buffer);
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
4258 defsubr (&Skill_all_local_variables);
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
4259
2776
8bf3bb4c20dd * lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents: 2722
diff changeset
4260 defsubr (&Soverlayp);
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
4261 defsubr (&Smake_overlay);
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
4262 defsubr (&Sdelete_overlay);
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
4263 defsubr (&Smove_overlay);
2787
995c6e665599 * buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents: 2776
diff changeset
4264 defsubr (&Soverlay_start);
995c6e665599 * buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents: 2776
diff changeset
4265 defsubr (&Soverlay_end);
995c6e665599 * buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents: 2776
diff changeset
4266 defsubr (&Soverlay_buffer);
995c6e665599 * buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents: 2776
diff changeset
4267 defsubr (&Soverlay_properties);
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
4268 defsubr (&Soverlays_at);
12382
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
4269 defsubr (&Soverlays_in);
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
4270 defsubr (&Snext_overlay_change);
8967
80b92977ed08 (overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents: 8924
diff changeset
4271 defsubr (&Sprevious_overlay_change);
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
4272 defsubr (&Soverlay_recenter);
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
4273 defsubr (&Soverlay_lists);
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
4274 defsubr (&Soverlay_get);
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
4275 defsubr (&Soverlay_put);
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
4276 }
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
4277
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
4278 keys_of_buffer ()
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
4279 {
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
4280 initial_define_key (control_x_map, 'b', "switch-to-buffer");
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
4281 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
4282
2c5f3537a1cc (syms_of_buffer): Don't do (put 'erase-buffer 'disabled t) here.
Roland McGrath <roland@gnu.org>
parents: 5502
diff changeset
4283 /* 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
4284 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
4285 Fput (intern ("erase-buffer"), Qdisabled, Qt);
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
4286 }