annotate src/buffer.c @ 65924:27e12359729e

Checked files: man/anti.texi, man/maintaining,texi, and lispref/anti.texi
author Chong Yidong <cyd@stupidchicken.com>
date Sat, 08 Oct 2005 13:28:55 +0000
parents 1ffe6d4d0fc4
children 7e251d472f1c de684325b343 10fe5fadaf89
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.
64770
a0d1312ede66 Update years in copyright notice; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 64572
diff changeset
2 Copyright (C) 1985, 1986, 1987, 1988, 1989, 1993, 1994,
a0d1312ede66 Update years in copyright notice; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 64572
diff changeset
3 1995, 1997, 1998, 1999, 2000, 2001, 2002,
a0d1312ede66 Update years in copyright notice; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 64572
diff changeset
4 2003, 2004, 2005 Free Software Foundation, Inc.
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
6 This file is part of GNU Emacs.
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
7
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
8 GNU Emacs is free software; you can redistribute it and/or modify
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
9 it under the terms of the GNU General Public License as published by
1953
714df59790af (Ferase_buffer): Added interactive spec.
Roland McGrath <roland@gnu.org>
parents: 1952
diff changeset
10 the Free Software Foundation; either version 2, or (at your option)
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
11 any later version.
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
12
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
13 GNU Emacs is distributed in the hope that it will be useful,
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
14 but WITHOUT ANY WARRANTY; without even the implied warranty of
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
15 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
16 GNU General Public License for more details.
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
17
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
18 You should have received a copy of the GNU General Public License
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
19 along with GNU Emacs; see the file COPYING. If not, write to
64084
a8fa7c632ee4 Update FSF's address.
Lute Kamstra <lute@gnu.org>
parents: 63570
diff changeset
20 the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
a8fa7c632ee4 Update FSF's address.
Lute Kamstra <lute@gnu.org>
parents: 63570
diff changeset
21 Boston, MA 02110-1301, USA. */
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
22
26088
b7aa6ac26872 Add support for large files, 64-bit Solaris, system locale codings.
Paul Eggert <eggert@twinsun.com>
parents: 26056
diff changeset
23 #include <config.h>
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
24
1563
e721339972b0 * buffer.c (init_buffer): If PWD is accurate, use it instead of
Jim Blandy <jimb@redhat.com>
parents: 1501
diff changeset
25 #include <sys/types.h>
e721339972b0 * buffer.c (init_buffer): If PWD is accurate, use it instead of
Jim Blandy <jimb@redhat.com>
parents: 1501
diff changeset
26 #include <sys/stat.h>
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
27 #include <sys/param.h>
19581
30f977ea74db Include errno.h.
Richard M. Stallman <rms@gnu.org>
parents: 19466
diff changeset
28 #include <errno.h>
31886
ca37d343042c Include stdio.h.
Dave Love <fx@gnu.org>
parents: 31612
diff changeset
29 #include <stdio.h>
19581
30f977ea74db Include errno.h.
Richard M. Stallman <rms@gnu.org>
parents: 19466
diff changeset
30
31102
6a0caa788013 Include keyboard.h before frame.h.
Andrew Innes <andrewi@gnu.org>
parents: 30911
diff changeset
31 #ifndef USE_CRT_DLL
19581
30f977ea74db Include errno.h.
Richard M. Stallman <rms@gnu.org>
parents: 19466
diff changeset
32 extern int errno;
31102
6a0caa788013 Include keyboard.h before frame.h.
Andrew Innes <andrewi@gnu.org>
parents: 30911
diff changeset
33 #endif
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
34
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
35
21514
fa9ff387d260 Fix -Wimplicit warnings.
Andreas Schwab <schwab@suse.de>
parents: 21506
diff changeset
36 #ifdef HAVE_UNISTD_H
fa9ff387d260 Fix -Wimplicit warnings.
Andreas Schwab <schwab@suse.de>
parents: 21506
diff changeset
37 #include <unistd.h>
fa9ff387d260 Fix -Wimplicit warnings.
Andreas Schwab <schwab@suse.de>
parents: 21506
diff changeset
38 #endif
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39974
diff changeset
39
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
40 #include "lisp.h"
1308
2660a7053836 * buffer.c: #include intervals.h.
Joseph Arceneaux <jla@gnu.org>
parents: 1291
diff changeset
41 #include "intervals.h"
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
42 #include "window.h"
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
43 #include "commands.h"
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
44 #include "buffer.h"
17022
907fb167f7de Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16840
diff changeset
45 #include "charset.h"
9403
9f797989b817 * buffer.c: #include region-cache.h.
Jim Blandy <jimb@redhat.com>
parents: 9362
diff changeset
46 #include "region-cache.h"
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
47 #include "indent.h"
2480
6f4b9c548425 Include blockinput.h.
Richard M. Stallman <rms@gnu.org>
parents: 2439
diff changeset
48 #include "blockinput.h"
31102
6a0caa788013 Include keyboard.h before frame.h.
Andrew Innes <andrewi@gnu.org>
parents: 30911
diff changeset
49 #include "keyboard.h"
39748
42b7a798ff79 Include keymap.h.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39581
diff changeset
50 #include "keymap.h"
18455
9f5626727351 (Fbuffer_list): New optional argument FRAME.
Richard M. Stallman <rms@gnu.org>
parents: 18178
diff changeset
51 #include "frame.h"
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
52
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
53 struct buffer *current_buffer; /* the current buffer */
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
54
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
55 /* First buffer in chain of all buffers (in reverse order of creation).
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
56 Threaded through ->next. */
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
57
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
58 struct buffer *all_buffers;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
59
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
60 /* This structure holds the default values of the buffer-local variables
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
61 defined with DEFVAR_PER_BUFFER, that have special slots in each buffer.
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
62 The default value occupies the same slot in this structure
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
63 as an individual buffer's value occupies in that buffer.
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
64 Setting the default value also goes through the alist of buffers
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
65 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
66
53655
4f64423a6040 (buffer_defaults, buffer_local_symbols): Use DECL_ALIGN.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53602
diff changeset
67 DECL_ALIGN (struct buffer, buffer_defaults);
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
68
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
69 /* A Lisp_Object pointer to the above, used for staticpro */
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
70
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
71 static Lisp_Object Vbuffer_defaults;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
72
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
73 /* This structure marks which slots in a buffer have corresponding
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
74 default values in buffer_defaults.
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
75 Each such slot has a nonzero value in this structure.
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
76 The value has only one nonzero bit.
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
77
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
78 When a buffer has its own local value for a slot,
28314
c46e609d887a (buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents: 28207
diff changeset
79 the entry for that slot (found in the same slot in this structure)
c46e609d887a (buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents: 28207
diff changeset
80 is turned on in the buffer's local_flags array.
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
81
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
82 If a slot in this structure is -1, then even though there may
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
83 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
84 and the corresponding slot in buffer_defaults is not used.
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
85
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
86 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
87 but there is a default value which is copied into each buffer.
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
88
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
89 If a slot in this structure corresponding to a DEFVAR_PER_BUFFER is
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
90 zero, that is a bug */
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
91
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
92 struct buffer buffer_local_flags;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
93
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
94 /* This structure holds the names of symbols whose values may be
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
95 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
96
53655
4f64423a6040 (buffer_defaults, buffer_local_symbols): Use DECL_ALIGN.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53602
diff changeset
97 DECL_ALIGN (struct buffer, buffer_local_symbols);
4f64423a6040 (buffer_defaults, buffer_local_symbols): Use DECL_ALIGN.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53602
diff changeset
98
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
99 /* A Lisp_Object pointer to the above, used for staticpro */
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
100 static Lisp_Object Vbuffer_local_symbols;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
101
1001
c1ebe69206df * buffer.c (syms_of_buffer): Call DEFVAR_PER_BUFFER with the new
Jim Blandy <jimb@redhat.com>
parents: 764
diff changeset
102 /* This structure holds the required types for the values in the
c1ebe69206df * buffer.c (syms_of_buffer): Call DEFVAR_PER_BUFFER with the new
Jim Blandy <jimb@redhat.com>
parents: 764
diff changeset
103 buffer-local slots. If a slot contains Qnil, then the
c1ebe69206df * buffer.c (syms_of_buffer): Call DEFVAR_PER_BUFFER with the new
Jim Blandy <jimb@redhat.com>
parents: 764
diff changeset
104 corresponding buffer slot may contain a value of any type. If a
c1ebe69206df * buffer.c (syms_of_buffer): Call DEFVAR_PER_BUFFER with the new
Jim Blandy <jimb@redhat.com>
parents: 764
diff changeset
105 slot contains an integer, then prospective values' tags must be
20995
abc60038dd2b (syms_of_buffer): enable-multibyte-characters is read-only.
Karl Heuer <kwzh@gnu.org>
parents: 20935
diff changeset
106 equal to that integer (except nil is always allowed).
abc60038dd2b (syms_of_buffer): enable-multibyte-characters is read-only.
Karl Heuer <kwzh@gnu.org>
parents: 20935
diff changeset
107 When a tag does not match, the function
abc60038dd2b (syms_of_buffer): enable-multibyte-characters is read-only.
Karl Heuer <kwzh@gnu.org>
parents: 20935
diff changeset
108 buffer_slot_type_mismatch will signal an error.
abc60038dd2b (syms_of_buffer): enable-multibyte-characters is read-only.
Karl Heuer <kwzh@gnu.org>
parents: 20935
diff changeset
109
abc60038dd2b (syms_of_buffer): enable-multibyte-characters is read-only.
Karl Heuer <kwzh@gnu.org>
parents: 20935
diff changeset
110 If a slot here contains -1, the corresponding variable is read-only. */
1001
c1ebe69206df * buffer.c (syms_of_buffer): Call DEFVAR_PER_BUFFER with the new
Jim Blandy <jimb@redhat.com>
parents: 764
diff changeset
111 struct buffer buffer_local_types;
c1ebe69206df * buffer.c (syms_of_buffer): Call DEFVAR_PER_BUFFER with the new
Jim Blandy <jimb@redhat.com>
parents: 764
diff changeset
112
15776
6018e01d4466 (buffer_permanent_local_flags): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 15638
diff changeset
113 /* Flags indicating which built-in buffer-local variables
6018e01d4466 (buffer_permanent_local_flags): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 15638
diff changeset
114 are permanent locals. */
28352
1555145f8c35 (buffer_permanent_local_flags): Use MAX_PER_BUFFER_VARS
Gerd Moellmann <gerd@gnu.org>
parents: 28332
diff changeset
115 static char buffer_permanent_local_flags[MAX_PER_BUFFER_VARS];
28314
c46e609d887a (buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents: 28207
diff changeset
116
c46e609d887a (buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents: 28207
diff changeset
117 /* Number of per-buffer variables used. */
c46e609d887a (buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents: 28207
diff changeset
118
28352
1555145f8c35 (buffer_permanent_local_flags): Use MAX_PER_BUFFER_VARS
Gerd Moellmann <gerd@gnu.org>
parents: 28332
diff changeset
119 int last_per_buffer_idx;
15776
6018e01d4466 (buffer_permanent_local_flags): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 15638
diff changeset
120
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
121 Lisp_Object Fset_buffer ();
392
dce611246f59 *** empty log message ***
Roland McGrath <roland@gnu.org>
parents: 333
diff changeset
122 void set_buffer_internal ();
11889
1067ddd12dfc (set_buffer_internal_1): New subroutine.
Karl Heuer <kwzh@gnu.org>
parents: 11838
diff changeset
123 void set_buffer_internal_1 ();
4077
a860278e3ab3 (verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents: 3884
diff changeset
124 static void call_overlay_mod_hooks ();
11214
b880572ce431 (Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents: 11112
diff changeset
125 static void swap_out_buffer_local_variables ();
15776
6018e01d4466 (buffer_permanent_local_flags): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 15638
diff changeset
126 static void reset_buffer_local_variables ();
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
127
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
128 /* Alist of all buffer names vs the buffers. */
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
129 /* This used to be a variable, but is no longer,
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
130 to prevent lossage due to user rplac'ing this alist or its elements. */
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
131 Lisp_Object Vbuffer_alist;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
132
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
133 /* Functions to call before and after each text change. */
6785
121f2c5eba5e (Vafter_change_functions, Vbefore_change_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 6697
diff changeset
134 Lisp_Object Vbefore_change_functions;
121f2c5eba5e (Vafter_change_functions, Vbefore_change_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 6697
diff changeset
135 Lisp_Object Vafter_change_functions;
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
136
2043
a1ab3501653c (reset_buffer_local_variables): Reset mark_active.
Richard M. Stallman <rms@gnu.org>
parents: 2020
diff changeset
137 Lisp_Object Vtransient_mark_mode;
a1ab3501653c (reset_buffer_local_variables): Reset mark_active.
Richard M. Stallman <rms@gnu.org>
parents: 2020
diff changeset
138
3481
56424e6245c2 (syms_of_buffer): Set up Lisp var inhibit-read-only.
Richard M. Stallman <rms@gnu.org>
parents: 3463
diff changeset
139 /* t means ignore all read-only text properties.
56424e6245c2 (syms_of_buffer): Set up Lisp var inhibit-read-only.
Richard M. Stallman <rms@gnu.org>
parents: 3463
diff changeset
140 A list means ignore such a property if its value is a member of the list.
56424e6245c2 (syms_of_buffer): Set up Lisp var inhibit-read-only.
Richard M. Stallman <rms@gnu.org>
parents: 3463
diff changeset
141 Any non-nil value means ignore buffer-read-only. */
56424e6245c2 (syms_of_buffer): Set up Lisp var inhibit-read-only.
Richard M. Stallman <rms@gnu.org>
parents: 3463
diff changeset
142 Lisp_Object Vinhibit_read_only;
56424e6245c2 (syms_of_buffer): Set up Lisp var inhibit-read-only.
Richard M. Stallman <rms@gnu.org>
parents: 3463
diff changeset
143
6051
0b144d967f30 (Fkill_buffer): Call the Vkill_buffer_query_functions.
Richard M. Stallman <rms@gnu.org>
parents: 5904
diff changeset
144 /* List of functions to call that can query about killing a buffer.
0b144d967f30 (Fkill_buffer): Call the Vkill_buffer_query_functions.
Richard M. Stallman <rms@gnu.org>
parents: 5904
diff changeset
145 If any of these functions returns nil, we don't kill it. */
0b144d967f30 (Fkill_buffer): Call the Vkill_buffer_query_functions.
Richard M. Stallman <rms@gnu.org>
parents: 5904
diff changeset
146 Lisp_Object Vkill_buffer_query_functions;
50014
3b2576528809 (Fkill_buffer): Use Frun_hook_with_args_until_failure
Richard M. Stallman <rms@gnu.org>
parents: 49974
diff changeset
147 Lisp_Object Qkill_buffer_query_functions;
6051
0b144d967f30 (Fkill_buffer): Call the Vkill_buffer_query_functions.
Richard M. Stallman <rms@gnu.org>
parents: 5904
diff changeset
148
1821
04fb1d3d6992 JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents: 1707
diff changeset
149 /* 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
150 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
151
1821
04fb1d3d6992 JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents: 1707
diff changeset
152 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
153 Lisp_Object Qbefore_change_functions;
937df231678c (Qbefore_change_functions, Qafter_change_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 12699
diff changeset
154 Lisp_Object Qafter_change_functions;
48635
2a9a1d761581 (Qucs_set_table_for_input): New.
Dave Love <fx@gnu.org>
parents: 48355
diff changeset
155 Lisp_Object Qucs_set_table_for_input;
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
156
23399
e80c5f687340 (inhibit_modification_hooks): New variable.
Kenichi Handa <handa@m17n.org>
parents: 23174
diff changeset
157 /* If nonzero, all modification hooks are suppressed. */
e80c5f687340 (inhibit_modification_hooks): New variable.
Kenichi Handa <handa@m17n.org>
parents: 23174
diff changeset
158 int inhibit_modification_hooks;
e80c5f687340 (inhibit_modification_hooks): New variable.
Kenichi Handa <handa@m17n.org>
parents: 23174
diff changeset
159
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
160 Lisp_Object Qfundamental_mode, Qmode_class, Qpermanent_local;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
161
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
162 Lisp_Object Qprotected_field;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
163
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
164 Lisp_Object QSFundamental; /* A string "Fundamental" */
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
165
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
166 Lisp_Object Qkill_buffer_hook;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
167
5433
7ac1e6f1565f Don't include syntax.h.
Richard M. Stallman <rms@gnu.org>
parents: 5247
diff changeset
168 Lisp_Object Qget_file_buffer;
7ac1e6f1565f Don't include syntax.h.
Richard M. Stallman <rms@gnu.org>
parents: 5247
diff changeset
169
2776
8bf3bb4c20dd * lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents: 2722
diff changeset
170 Lisp_Object Qoverlayp;
8bf3bb4c20dd * lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents: 2722
diff changeset
171
11693
efef31f1c42d (Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents: 11659
diff changeset
172 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
173
4213
616036bb2427 (Qmodification_hooks, Qinsert_in_front_hooks)
Richard M. Stallman <rms@gnu.org>
parents: 4100
diff changeset
174 Lisp_Object Qmodification_hooks;
616036bb2427 (Qmodification_hooks, Qinsert_in_front_hooks)
Richard M. Stallman <rms@gnu.org>
parents: 4100
diff changeset
175 Lisp_Object Qinsert_in_front_hooks;
616036bb2427 (Qmodification_hooks, Qinsert_in_front_hooks)
Richard M. Stallman <rms@gnu.org>
parents: 4100
diff changeset
176 Lisp_Object Qinsert_behind_hooks;
616036bb2427 (Qmodification_hooks, Qinsert_in_front_hooks)
Richard M. Stallman <rms@gnu.org>
parents: 4100
diff changeset
177
31604
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
178 static void alloc_buffer_text P_ ((struct buffer *, size_t));
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
179 static void free_buffer_text P_ ((struct buffer *b));
51844
c5036e7cc93b (overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51827
diff changeset
180 static struct Lisp_Overlay * copy_overlays P_ ((struct buffer *, struct Lisp_Overlay *));
51867
6713947da36f (modify_overlay): Update prototype.
Andreas Schwab <schwab@suse.de>
parents: 51853
diff changeset
181 static void modify_overlay P_ ((struct buffer *, EMACS_INT, EMACS_INT));
60683
d2f6fa8790f3 (buffer_lisp_local_variables): New function,
Richard M. Stallman <rms@gnu.org>
parents: 60248
diff changeset
182 static Lisp_Object buffer_lisp_local_variables P_ ((struct buffer *));
31604
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
183
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
184
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
185 /* For debugging; temporary. See set_buffer_internal. */
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
186 /* Lisp_Object Qlisp_mode, Vcheck_symbol; */
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
187
20368
9f5fab56f4b3 (nsberror, record_buffer, validate_region,
Kenichi Handa <handa@m17n.org>
parents: 20186
diff changeset
188 void
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
189 nsberror (spec)
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
190 Lisp_Object spec;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
191 {
9146
8f966cc4652b (nsberror, Fget_buffer, Fget_file_buffer, Fbuffer_local_variables,
Karl Heuer <kwzh@gnu.org>
parents: 9047
diff changeset
192 if (STRINGP (spec))
46370
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46293
diff changeset
193 error ("No buffer named %s", SDATA (spec));
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
194 error ("Invalid buffer argument");
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
195 }
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
196
14506
bddd8114eaa9 (Fbuffer_live_p): New function.
Richard M. Stallman <rms@gnu.org>
parents: 14481
diff changeset
197 DEFUN ("buffer-live-p", Fbuffer_live_p, Sbuffer_live_p, 1, 1, 0,
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39974
diff changeset
198 doc: /* Return non-nil if OBJECT is a buffer which has not been killed.
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39974
diff changeset
199 Value is nil if OBJECT is not a buffer or if it has been killed. */)
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39974
diff changeset
200 (object)
14506
bddd8114eaa9 (Fbuffer_live_p): New function.
Richard M. Stallman <rms@gnu.org>
parents: 14481
diff changeset
201 Lisp_Object object;
bddd8114eaa9 (Fbuffer_live_p): New function.
Richard M. Stallman <rms@gnu.org>
parents: 14481
diff changeset
202 {
bddd8114eaa9 (Fbuffer_live_p): New function.
Richard M. Stallman <rms@gnu.org>
parents: 14481
diff changeset
203 return ((BUFFERP (object) && ! NILP (XBUFFER (object)->name))
bddd8114eaa9 (Fbuffer_live_p): New function.
Richard M. Stallman <rms@gnu.org>
parents: 14481
diff changeset
204 ? Qt : Qnil);
bddd8114eaa9 (Fbuffer_live_p): New function.
Richard M. Stallman <rms@gnu.org>
parents: 14481
diff changeset
205 }
bddd8114eaa9 (Fbuffer_live_p): New function.
Richard M. Stallman <rms@gnu.org>
parents: 14481
diff changeset
206
18455
9f5626727351 (Fbuffer_list): New optional argument FRAME.
Richard M. Stallman <rms@gnu.org>
parents: 18178
diff changeset
207 DEFUN ("buffer-list", Fbuffer_list, Sbuffer_list, 0, 1, 0,
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39974
diff changeset
208 doc: /* Return a list of all existing live buffers.
46599
44651cb24a24 (Fbuffer_list): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 46588
diff changeset
209 If the optional arg FRAME is a frame, we return the buffer list
44651cb24a24 (Fbuffer_list): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 46588
diff changeset
210 in the proper order for that frame: the buffers in FRAME's `buffer-list'
44651cb24a24 (Fbuffer_list): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 46588
diff changeset
211 frame parameter come first, followed by the rest of the buffers. */)
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39974
diff changeset
212 (frame)
18455
9f5626727351 (Fbuffer_list): New optional argument FRAME.
Richard M. Stallman <rms@gnu.org>
parents: 18178
diff changeset
213 Lisp_Object frame;
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
214 {
18455
9f5626727351 (Fbuffer_list): New optional argument FRAME.
Richard M. Stallman <rms@gnu.org>
parents: 18178
diff changeset
215 Lisp_Object framelist, general;
9f5626727351 (Fbuffer_list): New optional argument FRAME.
Richard M. Stallman <rms@gnu.org>
parents: 18178
diff changeset
216 general = Fmapcar (Qcdr, Vbuffer_alist);
9f5626727351 (Fbuffer_list): New optional argument FRAME.
Richard M. Stallman <rms@gnu.org>
parents: 18178
diff changeset
217
9f5626727351 (Fbuffer_list): New optional argument FRAME.
Richard M. Stallman <rms@gnu.org>
parents: 18178
diff changeset
218 if (FRAMEP (frame))
9f5626727351 (Fbuffer_list): New optional argument FRAME.
Richard M. Stallman <rms@gnu.org>
parents: 18178
diff changeset
219 {
9f5626727351 (Fbuffer_list): New optional argument FRAME.
Richard M. Stallman <rms@gnu.org>
parents: 18178
diff changeset
220 Lisp_Object tail;
9f5626727351 (Fbuffer_list): New optional argument FRAME.
Richard M. Stallman <rms@gnu.org>
parents: 18178
diff changeset
221
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40605
diff changeset
222 CHECK_FRAME (frame);
18455
9f5626727351 (Fbuffer_list): New optional argument FRAME.
Richard M. Stallman <rms@gnu.org>
parents: 18178
diff changeset
223
9f5626727351 (Fbuffer_list): New optional argument FRAME.
Richard M. Stallman <rms@gnu.org>
parents: 18178
diff changeset
224 framelist = Fcopy_sequence (XFRAME (frame)->buffer_list);
9f5626727351 (Fbuffer_list): New optional argument FRAME.
Richard M. Stallman <rms@gnu.org>
parents: 18178
diff changeset
225
9f5626727351 (Fbuffer_list): New optional argument FRAME.
Richard M. Stallman <rms@gnu.org>
parents: 18178
diff changeset
226 /* Remove from GENERAL any buffer that duplicates one in FRAMELIST. */
9f5626727351 (Fbuffer_list): New optional argument FRAME.
Richard M. Stallman <rms@gnu.org>
parents: 18178
diff changeset
227 tail = framelist;
9f5626727351 (Fbuffer_list): New optional argument FRAME.
Richard M. Stallman <rms@gnu.org>
parents: 18178
diff changeset
228 while (! NILP (tail))
9f5626727351 (Fbuffer_list): New optional argument FRAME.
Richard M. Stallman <rms@gnu.org>
parents: 18178
diff changeset
229 {
26164
d39ec0a27081 more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents: 26088
diff changeset
230 general = Fdelq (XCAR (tail), general);
d39ec0a27081 more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents: 26088
diff changeset
231 tail = XCDR (tail);
18455
9f5626727351 (Fbuffer_list): New optional argument FRAME.
Richard M. Stallman <rms@gnu.org>
parents: 18178
diff changeset
232 }
9f5626727351 (Fbuffer_list): New optional argument FRAME.
Richard M. Stallman <rms@gnu.org>
parents: 18178
diff changeset
233 return nconc2 (framelist, general);
9f5626727351 (Fbuffer_list): New optional argument FRAME.
Richard M. Stallman <rms@gnu.org>
parents: 18178
diff changeset
234 }
9f5626727351 (Fbuffer_list): New optional argument FRAME.
Richard M. Stallman <rms@gnu.org>
parents: 18178
diff changeset
235
9f5626727351 (Fbuffer_list): New optional argument FRAME.
Richard M. Stallman <rms@gnu.org>
parents: 18178
diff changeset
236 return general;
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
237 }
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
238
10210
43e95429ffa0 (Fget_buffer_create): Copy the name, and clear text props.
Richard M. Stallman <rms@gnu.org>
parents: 10146
diff changeset
239 /* 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
240 (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
241 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
242
43e95429ffa0 (Fget_buffer_create): Copy the name, and clear text props.
Richard M. Stallman <rms@gnu.org>
parents: 10146
diff changeset
243 static Lisp_Object
43e95429ffa0 (Fget_buffer_create): Copy the name, and clear text props.
Richard M. Stallman <rms@gnu.org>
parents: 10146
diff changeset
244 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
245 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
246 Lisp_Object list;
43e95429ffa0 (Fget_buffer_create): Copy the name, and clear text props.
Richard M. Stallman <rms@gnu.org>
parents: 10146
diff changeset
247 {
43e95429ffa0 (Fget_buffer_create): Copy the name, and clear text props.
Richard M. Stallman <rms@gnu.org>
parents: 10146
diff changeset
248 register Lisp_Object tail;
47972
287494c5e770 (assoc_ignore_text_properties, Fother_buffer, Fkill_buffer)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 46920
diff changeset
249 for (tail = list; CONSP (tail); tail = XCDR (tail))
10210
43e95429ffa0 (Fget_buffer_create): Copy the name, and clear text props.
Richard M. Stallman <rms@gnu.org>
parents: 10146
diff changeset
250 {
43e95429ffa0 (Fget_buffer_create): Copy the name, and clear text props.
Richard M. Stallman <rms@gnu.org>
parents: 10146
diff changeset
251 register Lisp_Object elt, tem;
47972
287494c5e770 (assoc_ignore_text_properties, Fother_buffer, Fkill_buffer)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 46920
diff changeset
252 elt = XCAR (tail);
10210
43e95429ffa0 (Fget_buffer_create): Copy the name, and clear text props.
Richard M. Stallman <rms@gnu.org>
parents: 10146
diff changeset
253 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
254 if (!NILP (tem))
43e95429ffa0 (Fget_buffer_create): Copy the name, and clear text props.
Richard M. Stallman <rms@gnu.org>
parents: 10146
diff changeset
255 return elt;
43e95429ffa0 (Fget_buffer_create): Copy the name, and clear text props.
Richard M. Stallman <rms@gnu.org>
parents: 10146
diff changeset
256 }
43e95429ffa0 (Fget_buffer_create): Copy the name, and clear text props.
Richard M. Stallman <rms@gnu.org>
parents: 10146
diff changeset
257 return Qnil;
43e95429ffa0 (Fget_buffer_create): Copy the name, and clear text props.
Richard M. Stallman <rms@gnu.org>
parents: 10146
diff changeset
258 }
43e95429ffa0 (Fget_buffer_create): Copy the name, and clear text props.
Richard M. Stallman <rms@gnu.org>
parents: 10146
diff changeset
259
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
260 DEFUN ("get-buffer", Fget_buffer, Sget_buffer, 1, 1, 0,
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39974
diff changeset
261 doc: /* Return the buffer named NAME (a string).
39971
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
262 If there is no live buffer named NAME, return nil.
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39974
diff changeset
263 NAME may also be a buffer; if so, the value is that buffer. */)
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39974
diff changeset
264 (name)
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
265 register Lisp_Object name;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
266 {
9146
8f966cc4652b (nsberror, Fget_buffer, Fget_file_buffer, Fbuffer_local_variables,
Karl Heuer <kwzh@gnu.org>
parents: 9047
diff changeset
267 if (BUFFERP (name))
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
268 return name;
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40605
diff changeset
269 CHECK_STRING (name);
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
270
10210
43e95429ffa0 (Fget_buffer_create): Copy the name, and clear text props.
Richard M. Stallman <rms@gnu.org>
parents: 10146
diff changeset
271 return Fcdr (assoc_ignore_text_properties (name, Vbuffer_alist));
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
272 }
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
273
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
274 DEFUN ("get-file-buffer", Fget_file_buffer, Sget_file_buffer, 1, 1, 0,
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39974
diff changeset
275 doc: /* Return the buffer visiting file FILENAME (a string).
39971
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
276 The buffer's `buffer-file-name' must match exactly the expansion of FILENAME.
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
277 If there is no such live buffer, return nil.
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39974
diff changeset
278 See also `find-buffer-visiting'. */)
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39974
diff changeset
279 (filename)
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
280 register Lisp_Object filename;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
281 {
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
282 register Lisp_Object tail, buf, tem;
5433
7ac1e6f1565f Don't include syntax.h.
Richard M. Stallman <rms@gnu.org>
parents: 5247
diff changeset
283 Lisp_Object handler;
7ac1e6f1565f Don't include syntax.h.
Richard M. Stallman <rms@gnu.org>
parents: 5247
diff changeset
284
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40605
diff changeset
285 CHECK_STRING (filename);
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
286 filename = Fexpand_file_name (filename, Qnil);
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
287
5433
7ac1e6f1565f Don't include syntax.h.
Richard M. Stallman <rms@gnu.org>
parents: 5247
diff changeset
288 /* 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
289 call the corresponding file handler. */
7028
6915bf781a38 Pass operation to Ffind_file_name_handler.
Karl Heuer <kwzh@gnu.org>
parents: 6785
diff changeset
290 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
291 if (!NILP (handler))
7ac1e6f1565f Don't include syntax.h.
Richard M. Stallman <rms@gnu.org>
parents: 5247
diff changeset
292 return call2 (handler, Qget_file_buffer, filename);
7ac1e6f1565f Don't include syntax.h.
Richard M. Stallman <rms@gnu.org>
parents: 5247
diff changeset
293
26164
d39ec0a27081 more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents: 26088
diff changeset
294 for (tail = Vbuffer_alist; CONSP (tail); tail = XCDR (tail))
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
295 {
26164
d39ec0a27081 more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents: 26088
diff changeset
296 buf = Fcdr (XCAR (tail));
9146
8f966cc4652b (nsberror, Fget_buffer, Fget_file_buffer, Fbuffer_local_variables,
Karl Heuer <kwzh@gnu.org>
parents: 9047
diff changeset
297 if (!BUFFERP (buf)) continue;
8f966cc4652b (nsberror, Fget_buffer, Fget_file_buffer, Fbuffer_local_variables,
Karl Heuer <kwzh@gnu.org>
parents: 9047
diff changeset
298 if (!STRINGP (XBUFFER (buf)->filename)) continue;
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
299 tem = Fstring_equal (XBUFFER (buf)->filename, filename);
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 392
diff changeset
300 if (!NILP (tem))
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
301 return buf;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
302 }
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
303 return Qnil;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
304 }
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
305
12810
bd486675e103 (get_truename_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12785
diff changeset
306 Lisp_Object
bd486675e103 (get_truename_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12785
diff changeset
307 get_truename_buffer (filename)
bd486675e103 (get_truename_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12785
diff changeset
308 register Lisp_Object filename;
bd486675e103 (get_truename_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12785
diff changeset
309 {
bd486675e103 (get_truename_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12785
diff changeset
310 register Lisp_Object tail, buf, tem;
bd486675e103 (get_truename_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12785
diff changeset
311
26164
d39ec0a27081 more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents: 26088
diff changeset
312 for (tail = Vbuffer_alist; CONSP (tail); tail = XCDR (tail))
12810
bd486675e103 (get_truename_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12785
diff changeset
313 {
26164
d39ec0a27081 more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents: 26088
diff changeset
314 buf = Fcdr (XCAR (tail));
12810
bd486675e103 (get_truename_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12785
diff changeset
315 if (!BUFFERP (buf)) continue;
bd486675e103 (get_truename_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12785
diff changeset
316 if (!STRINGP (XBUFFER (buf)->file_truename)) continue;
bd486675e103 (get_truename_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12785
diff changeset
317 tem = Fstring_equal (XBUFFER (buf)->file_truename, filename);
bd486675e103 (get_truename_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12785
diff changeset
318 if (!NILP (tem))
bd486675e103 (get_truename_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12785
diff changeset
319 return buf;
bd486675e103 (get_truename_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12785
diff changeset
320 }
bd486675e103 (get_truename_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12785
diff changeset
321 return Qnil;
bd486675e103 (get_truename_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12785
diff changeset
322 }
bd486675e103 (get_truename_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12785
diff changeset
323
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
324 /* Incremented for each buffer created, to assign the buffer number. */
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
325 int buffer_count;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
326
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
327 DEFUN ("get-buffer-create", Fget_buffer_create, Sget_buffer_create, 1, 1, 0,
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39974
diff changeset
328 doc: /* Return the buffer named NAME, or create such a buffer and return it.
39971
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
329 A new buffer is created if there is no live buffer named NAME.
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
330 If NAME starts with a space, the new buffer does not keep undo information.
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
331 If NAME is a buffer instead of a string, then it is the value returned.
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39974
diff changeset
332 The value is never nil. */)
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39974
diff changeset
333 (name)
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
334 register Lisp_Object name;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
335 {
9732
577db538b0b6 (Fset_buffer_major_mode): New function. Set the default major mode here.
Karl Heuer <kwzh@gnu.org>
parents: 9632
diff changeset
336 register Lisp_Object buf;
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
337 register struct buffer *b;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
338
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
339 buf = Fget_buffer (name);
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 392
diff changeset
340 if (!NILP (buf))
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
341 return buf;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
342
46370
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46293
diff changeset
343 if (SCHARS (name) == 0)
6697
28e36f59e856 (Fget_buffer_create): Disallow empty string.
Karl Heuer <kwzh@gnu.org>
parents: 6675
diff changeset
344 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
345
27739
e272d652619a (Fget_buffer_create, Fmake_indirect_buffer): Use
Gerd Moellmann <gerd@gnu.org>
parents: 27480
diff changeset
346 b = (struct buffer *) allocate_buffer ();
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
347
10314
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
348 b->size = sizeof (struct buffer) / sizeof (EMACS_INT);
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
349
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
350 /* 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
351 b->text = &b->own_text;
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
352 b->base_buffer = 0;
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
353
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
354 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
355 BLOCK_INPUT;
17022
907fb167f7de Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16840
diff changeset
356 /* 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
357 anchoring a search. */
31604
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
358 alloc_buffer_text (b, BUF_GAP_SIZE (b) + 1);
2439
b6c62e4abf59 Put interrupt input blocking in a separate file from xterm.h.
Jim Blandy <jimb@redhat.com>
parents: 2389
diff changeset
359 UNBLOCK_INPUT;
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
360 if (! BUF_BEG_ADDR (b))
10668
acbd9fab366a (Fget_buffer_create): Call buffer_memory_full.
Richard M. Stallman <rms@gnu.org>
parents: 10611
diff changeset
361 buffer_memory_full ();
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
362
47972
287494c5e770 (assoc_ignore_text_properties, Fother_buffer, Fkill_buffer)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 46920
diff changeset
363 BUF_PT (b) = BEG;
287494c5e770 (assoc_ignore_text_properties, Fother_buffer, Fkill_buffer)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 46920
diff changeset
364 BUF_GPT (b) = BEG;
287494c5e770 (assoc_ignore_text_properties, Fother_buffer, Fkill_buffer)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 46920
diff changeset
365 BUF_BEGV (b) = BEG;
287494c5e770 (assoc_ignore_text_properties, Fother_buffer, Fkill_buffer)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 46920
diff changeset
366 BUF_ZV (b) = BEG;
287494c5e770 (assoc_ignore_text_properties, Fother_buffer, Fkill_buffer)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 46920
diff changeset
367 BUF_Z (b) = BEG;
287494c5e770 (assoc_ignore_text_properties, Fother_buffer, Fkill_buffer)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 46920
diff changeset
368 BUF_PT_BYTE (b) = BEG_BYTE;
287494c5e770 (assoc_ignore_text_properties, Fother_buffer, Fkill_buffer)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 46920
diff changeset
369 BUF_GPT_BYTE (b) = BEG_BYTE;
287494c5e770 (assoc_ignore_text_properties, Fother_buffer, Fkill_buffer)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 46920
diff changeset
370 BUF_BEGV_BYTE (b) = BEG_BYTE;
287494c5e770 (assoc_ignore_text_properties, Fother_buffer, Fkill_buffer)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 46920
diff changeset
371 BUF_ZV_BYTE (b) = BEG_BYTE;
287494c5e770 (assoc_ignore_text_properties, Fother_buffer, Fkill_buffer)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 46920
diff changeset
372 BUF_Z_BYTE (b) = BEG_BYTE;
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
373 BUF_MODIFF (b) = 1;
16213
3b8851bebc76 (Fget_buffer_create): Initialize BUF_OVERLAY_MODIFF.
Richard M. Stallman <rms@gnu.org>
parents: 16193
diff changeset
374 BUF_OVERLAY_MODIFF (b) = 1;
10314
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
375 BUF_SAVE_MODIFF (b) = 1;
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
376 BUF_INTERVALS (b) = 0;
25368
f9949db6ca7d (set_buffer_internal): Set windows_or_buffers_changed
Gerd Moellmann <gerd@gnu.org>
parents: 25351
diff changeset
377 BUF_UNCHANGED_MODIFIED (b) = 1;
f9949db6ca7d (set_buffer_internal): Set windows_or_buffers_changed
Gerd Moellmann <gerd@gnu.org>
parents: 25351
diff changeset
378 BUF_OVERLAY_UNCHANGED_MODIFIED (b) = 1;
f9949db6ca7d (set_buffer_internal): Set windows_or_buffers_changed
Gerd Moellmann <gerd@gnu.org>
parents: 25351
diff changeset
379 BUF_END_UNCHANGED (b) = 0;
f9949db6ca7d (set_buffer_internal): Set windows_or_buffers_changed
Gerd Moellmann <gerd@gnu.org>
parents: 25351
diff changeset
380 BUF_BEG_UNCHANGED (b) = 0;
17022
907fb167f7de Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16840
diff changeset
381 *(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
382
9403
9f797989b817 * buffer.c: #include region-cache.h.
Jim Blandy <jimb@redhat.com>
parents: 9362
diff changeset
383 b->newline_cache = 0;
9f797989b817 * buffer.c: #include region-cache.h.
Jim Blandy <jimb@redhat.com>
parents: 9362
diff changeset
384 b->width_run_cache = 0;
9f797989b817 * buffer.c: #include region-cache.h.
Jim Blandy <jimb@redhat.com>
parents: 9362
diff changeset
385 b->width_table = Qnil;
25368
f9949db6ca7d (set_buffer_internal): Set windows_or_buffers_changed
Gerd Moellmann <gerd@gnu.org>
parents: 25351
diff changeset
386 b->prevent_redisplay_optimizations_p = 1;
9403
9f797989b817 * buffer.c: #include region-cache.h.
Jim Blandy <jimb@redhat.com>
parents: 9362
diff changeset
387
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
388 /* Put this on the chain of all buffers including killed ones. */
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
389 b->next = all_buffers;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
390 all_buffers = b;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
391
10314
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
392 /* An ordinary buffer normally doesn't need markers
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
393 to handle BEGV and ZV. */
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
394 b->pt_marker = Qnil;
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
395 b->begv_marker = Qnil;
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
396 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
397
43e95429ffa0 (Fget_buffer_create): Copy the name, and clear text props.
Richard M. Stallman <rms@gnu.org>
parents: 10146
diff changeset
398 name = Fcopy_sequence (name);
46378
ef7dc46ecd0b * buffer.c (Fget_buffer_create, Fmake_indirect_buffer): Use it.
Ken Raeburn <raeburn@raeburn.org>
parents: 46370
diff changeset
399 STRING_SET_INTERVALS (name, NULL_INTERVAL);
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
400 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
401
46370
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46293
diff changeset
402 if (SREF (name, 0) != ' ')
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
403 b->undo_list = Qnil;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
404 else
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
405 b->undo_list = Qt;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
406
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
407 reset_buffer (b);
15776
6018e01d4466 (buffer_permanent_local_flags): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 15638
diff changeset
408 reset_buffer_local_variables (b, 1);
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
409
48776
67a496befc04 (Fget_buffer_create): Call Qucs_set_table_for_input as the last thing.
Richard M. Stallman <rms@gnu.org>
parents: 48635
diff changeset
410 b->mark = Fmake_marker ();
51669
f3dc77591fe2 (set_buffer_internal_1): Test CONSP for lists.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51431
diff changeset
411 BUF_MARKERS (b) = NULL;
48776
67a496befc04 (Fget_buffer_create): Call Qucs_set_table_for_input as the last thing.
Richard M. Stallman <rms@gnu.org>
parents: 48635
diff changeset
412 b->name = name;
67a496befc04 (Fget_buffer_create): Call Qucs_set_table_for_input as the last thing.
Richard M. Stallman <rms@gnu.org>
parents: 48635
diff changeset
413
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
414 /* 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
415 XSETBUFFER (buf, b);
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
416 Vbuffer_alist = nconc2 (Vbuffer_alist, Fcons (Fcons (name, buf), Qnil));
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
417
51318
0b5248964d32 Comment.
Dave Love <fx@gnu.org>
parents: 51255
diff changeset
418 /* An error in calling the function here (should someone redfine it)
0b5248964d32 Comment.
Dave Love <fx@gnu.org>
parents: 51255
diff changeset
419 can lead to infinite regress until you run out of stack. rms
0b5248964d32 Comment.
Dave Love <fx@gnu.org>
parents: 51255
diff changeset
420 says that's not worth protecting against. */
48635
2a9a1d761581 (Qucs_set_table_for_input): New.
Dave Love <fx@gnu.org>
parents: 48355
diff changeset
421 if (!NILP (Ffboundp (Qucs_set_table_for_input)))
51318
0b5248964d32 Comment.
Dave Love <fx@gnu.org>
parents: 51255
diff changeset
422 /* buf is on buffer-alist, so no gcpro. */
48635
2a9a1d761581 (Qucs_set_table_for_input): New.
Dave Love <fx@gnu.org>
parents: 48355
diff changeset
423 call1 (Qucs_set_table_for_input, buf);
2a9a1d761581 (Qucs_set_table_for_input): New.
Dave Love <fx@gnu.org>
parents: 48355
diff changeset
424
9732
577db538b0b6 (Fset_buffer_major_mode): New function. Set the default major mode here.
Karl Heuer <kwzh@gnu.org>
parents: 9632
diff changeset
425 return buf;
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
426 }
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
427
28625
5d68443d3df1 (clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28518
diff changeset
428
37752
1085e1cfebaf (copy_overlays): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 37463
diff changeset
429 /* Return a list of overlays which is a copy of the overlay list
1085e1cfebaf (copy_overlays): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 37463
diff changeset
430 LIST, but for buffer B. */
1085e1cfebaf (copy_overlays): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 37463
diff changeset
431
51844
c5036e7cc93b (overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51827
diff changeset
432 static struct Lisp_Overlay *
37752
1085e1cfebaf (copy_overlays): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 37463
diff changeset
433 copy_overlays (b, list)
1085e1cfebaf (copy_overlays): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 37463
diff changeset
434 struct buffer *b;
51844
c5036e7cc93b (overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51827
diff changeset
435 struct Lisp_Overlay *list;
37752
1085e1cfebaf (copy_overlays): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 37463
diff changeset
436 {
51844
c5036e7cc93b (overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51827
diff changeset
437 Lisp_Object buffer;
c5036e7cc93b (overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51827
diff changeset
438 struct Lisp_Overlay *result = NULL, *tail = NULL;
37752
1085e1cfebaf (copy_overlays): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 37463
diff changeset
439
1085e1cfebaf (copy_overlays): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 37463
diff changeset
440 XSETBUFFER (buffer, b);
1085e1cfebaf (copy_overlays): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 37463
diff changeset
441
51844
c5036e7cc93b (overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51827
diff changeset
442 for (; list; list = list->next)
37752
1085e1cfebaf (copy_overlays): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 37463
diff changeset
443 {
1085e1cfebaf (copy_overlays): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 37463
diff changeset
444 Lisp_Object overlay, start, end, old_overlay;
51939
d38453fdf2a0 (copy_overlays): Use EMACS_INT for positions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51867
diff changeset
445 EMACS_INT charpos;
37752
1085e1cfebaf (copy_overlays): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 37463
diff changeset
446
51844
c5036e7cc93b (overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51827
diff changeset
447 XSETMISC (old_overlay, list);
37752
1085e1cfebaf (copy_overlays): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 37463
diff changeset
448 charpos = marker_position (OVERLAY_START (old_overlay));
1085e1cfebaf (copy_overlays): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 37463
diff changeset
449 start = Fmake_marker ();
37950
f01f454ea6bf (copy_overlays): Make ENABLE_CHECKING happy.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 37752
diff changeset
450 Fset_marker (start, make_number (charpos), buffer);
37752
1085e1cfebaf (copy_overlays): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 37463
diff changeset
451 XMARKER (start)->insertion_type
1085e1cfebaf (copy_overlays): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 37463
diff changeset
452 = XMARKER (OVERLAY_START (old_overlay))->insertion_type;
1085e1cfebaf (copy_overlays): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 37463
diff changeset
453
1085e1cfebaf (copy_overlays): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 37463
diff changeset
454 charpos = marker_position (OVERLAY_END (old_overlay));
1085e1cfebaf (copy_overlays): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 37463
diff changeset
455 end = Fmake_marker ();
37950
f01f454ea6bf (copy_overlays): Make ENABLE_CHECKING happy.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 37752
diff changeset
456 Fset_marker (end, make_number (charpos), buffer);
37752
1085e1cfebaf (copy_overlays): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 37463
diff changeset
457 XMARKER (end)->insertion_type
1085e1cfebaf (copy_overlays): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 37463
diff changeset
458 = XMARKER (OVERLAY_END (old_overlay))->insertion_type;
1085e1cfebaf (copy_overlays): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 37463
diff changeset
459
1085e1cfebaf (copy_overlays): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 37463
diff changeset
460 overlay = allocate_misc ();
1085e1cfebaf (copy_overlays): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 37463
diff changeset
461 XMISCTYPE (overlay) = Lisp_Misc_Overlay;
1085e1cfebaf (copy_overlays): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 37463
diff changeset
462 OVERLAY_START (overlay) = start;
1085e1cfebaf (copy_overlays): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 37463
diff changeset
463 OVERLAY_END (overlay) = end;
1085e1cfebaf (copy_overlays): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 37463
diff changeset
464 OVERLAY_PLIST (overlay) = Fcopy_sequence (OVERLAY_PLIST (old_overlay));
51844
c5036e7cc93b (overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51827
diff changeset
465 XOVERLAY (overlay)->next = NULL;
c5036e7cc93b (overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51827
diff changeset
466
c5036e7cc93b (overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51827
diff changeset
467 if (tail)
c5036e7cc93b (overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51827
diff changeset
468 tail = tail->next = XOVERLAY (overlay);
c5036e7cc93b (overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51827
diff changeset
469 else
c5036e7cc93b (overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51827
diff changeset
470 result = tail = XOVERLAY (overlay);
37752
1085e1cfebaf (copy_overlays): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 37463
diff changeset
471 }
1085e1cfebaf (copy_overlays): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 37463
diff changeset
472
51844
c5036e7cc93b (overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51827
diff changeset
473 return result;
37752
1085e1cfebaf (copy_overlays): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 37463
diff changeset
474 }
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49444
diff changeset
475
37752
1085e1cfebaf (copy_overlays): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 37463
diff changeset
476
28625
5d68443d3df1 (clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28518
diff changeset
477 /* Clone per-buffer values of buffer FROM.
5d68443d3df1 (clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28518
diff changeset
478
5d68443d3df1 (clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28518
diff changeset
479 Buffer TO gets the same per-buffer values as FROM, with the
5d68443d3df1 (clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28518
diff changeset
480 following exceptions: (1) TO's name is left untouched, (2) markers
5d68443d3df1 (clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28518
diff changeset
481 are copied and made to refer to TO, and (3) overlay lists are
5d68443d3df1 (clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28518
diff changeset
482 copied. */
5d68443d3df1 (clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28518
diff changeset
483
5d68443d3df1 (clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28518
diff changeset
484 static void
5d68443d3df1 (clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28518
diff changeset
485 clone_per_buffer_values (from, to)
5d68443d3df1 (clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28518
diff changeset
486 struct buffer *from, *to;
5d68443d3df1 (clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28518
diff changeset
487 {
55744
dc4797dbcccd (clone_per_buffer_values): Copy the alist of local vars,
Richard M. Stallman <rms@gnu.org>
parents: 55270
diff changeset
488 Lisp_Object to_buffer, tem;
28625
5d68443d3df1 (clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28518
diff changeset
489 int offset;
5d68443d3df1 (clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28518
diff changeset
490
5d68443d3df1 (clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28518
diff changeset
491 XSETBUFFER (to_buffer, to);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49444
diff changeset
492
28625
5d68443d3df1 (clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28518
diff changeset
493 for (offset = PER_BUFFER_VAR_OFFSET (name) + sizeof (Lisp_Object);
5d68443d3df1 (clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28518
diff changeset
494 offset < sizeof *to;
5d68443d3df1 (clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28518
diff changeset
495 offset += sizeof (Lisp_Object))
5d68443d3df1 (clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28518
diff changeset
496 {
5d68443d3df1 (clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28518
diff changeset
497 Lisp_Object obj;
5d68443d3df1 (clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28518
diff changeset
498
5d68443d3df1 (clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28518
diff changeset
499 obj = PER_BUFFER_VALUE (from, offset);
5d68443d3df1 (clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28518
diff changeset
500 if (MARKERP (obj))
5d68443d3df1 (clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28518
diff changeset
501 {
5d68443d3df1 (clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28518
diff changeset
502 struct Lisp_Marker *m = XMARKER (obj);
5d68443d3df1 (clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28518
diff changeset
503 obj = Fmake_marker ();
5d68443d3df1 (clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28518
diff changeset
504 XMARKER (obj)->insertion_type = m->insertion_type;
5d68443d3df1 (clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28518
diff changeset
505 set_marker_both (obj, to_buffer, m->charpos, m->bytepos);
5d68443d3df1 (clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28518
diff changeset
506 }
5d68443d3df1 (clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28518
diff changeset
507
5d68443d3df1 (clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28518
diff changeset
508 PER_BUFFER_VALUE (to, offset) = obj;
5d68443d3df1 (clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28518
diff changeset
509 }
5d68443d3df1 (clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28518
diff changeset
510
5d68443d3df1 (clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28518
diff changeset
511 bcopy (from->local_flags, to->local_flags, sizeof to->local_flags);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49444
diff changeset
512
37752
1085e1cfebaf (copy_overlays): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 37463
diff changeset
513 to->overlays_before = copy_overlays (to, from->overlays_before);
1085e1cfebaf (copy_overlays): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 37463
diff changeset
514 to->overlays_after = copy_overlays (to, from->overlays_after);
55744
dc4797dbcccd (clone_per_buffer_values): Copy the alist of local vars,
Richard M. Stallman <rms@gnu.org>
parents: 55270
diff changeset
515
60683
d2f6fa8790f3 (buffer_lisp_local_variables): New function,
Richard M. Stallman <rms@gnu.org>
parents: 60248
diff changeset
516 /* Get (a copy of) the alist of Lisp-level local variables of FROM
d2f6fa8790f3 (buffer_lisp_local_variables): New function,
Richard M. Stallman <rms@gnu.org>
parents: 60248
diff changeset
517 and install that in TO. */
d2f6fa8790f3 (buffer_lisp_local_variables): New function,
Richard M. Stallman <rms@gnu.org>
parents: 60248
diff changeset
518 to->local_var_alist = buffer_lisp_local_variables (from);
28625
5d68443d3df1 (clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28518
diff changeset
519 }
5d68443d3df1 (clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28518
diff changeset
520
5d68443d3df1 (clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28518
diff changeset
521 DEFUN ("make-indirect-buffer", Fmake_indirect_buffer, Smake_indirect_buffer,
5d68443d3df1 (clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28518
diff changeset
522 2, 3,
11838
92a61e91ec05 (Fmake_indirect_buffer): Fix interactive spec.
Karl Heuer <kwzh@gnu.org>
parents: 11823
diff changeset
523 "bMake indirect buffer (to buffer): \nBName of indirect buffer: ",
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39974
diff changeset
524 doc: /* Create and return an indirect buffer for buffer BASE-BUFFER, named NAME.
54834
9533e29b87e8 (Fmake_indirect_buffer): Throw an error if the intended base buffer
Luc Teirlinck <teirllm@auburn.edu>
parents: 54819
diff changeset
525 BASE-BUFFER should be a live buffer, or the name of an existing buffer.
39971
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
526 NAME should be a string which is not the name of an existing buffer.
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
527 Optional argument CLONE non-nil means preserve BASE-BUFFER's state,
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
528 such as major and minor modes, in the indirect buffer.
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39974
diff changeset
529 CLONE nil means the indirect buffer's state is reset to default values. */)
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39974
diff changeset
530 (base_buffer, name, clone)
28625
5d68443d3df1 (clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28518
diff changeset
531 Lisp_Object base_buffer, name, clone;
10314
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
532 {
54834
9533e29b87e8 (Fmake_indirect_buffer): Throw an error if the intended base buffer
Luc Teirlinck <teirllm@auburn.edu>
parents: 54819
diff changeset
533 Lisp_Object buf, tem;
28625
5d68443d3df1 (clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28518
diff changeset
534 struct buffer *b;
10314
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
535
54819
8df5ed349fc2 (Fmake_indirect_buffer): Check that NAME is a string.
Andreas Schwab <schwab@suse.de>
parents: 54786
diff changeset
536 CHECK_STRING (name);
10314
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
537 buf = Fget_buffer (name);
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
538 if (!NILP (buf))
46370
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46293
diff changeset
539 error ("Buffer name `%s' is in use", SDATA (name));
10314
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
540
54834
9533e29b87e8 (Fmake_indirect_buffer): Throw an error if the intended base buffer
Luc Teirlinck <teirllm@auburn.edu>
parents: 54819
diff changeset
541 tem = base_buffer;
10314
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
542 base_buffer = Fget_buffer (base_buffer);
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
543 if (NILP (base_buffer))
54834
9533e29b87e8 (Fmake_indirect_buffer): Throw an error if the intended base buffer
Luc Teirlinck <teirllm@auburn.edu>
parents: 54819
diff changeset
544 error ("No such buffer: `%s'", SDATA (tem));
9533e29b87e8 (Fmake_indirect_buffer): Throw an error if the intended base buffer
Luc Teirlinck <teirllm@auburn.edu>
parents: 54819
diff changeset
545 if (NILP (XBUFFER (base_buffer)->name))
9533e29b87e8 (Fmake_indirect_buffer): Throw an error if the intended base buffer
Luc Teirlinck <teirllm@auburn.edu>
parents: 54819
diff changeset
546 error ("Base buffer has been killed");
46370
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46293
diff changeset
547
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46293
diff changeset
548 if (SCHARS (name) == 0)
10314
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
549 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
550
27739
e272d652619a (Fget_buffer_create, Fmake_indirect_buffer): Use
Gerd Moellmann <gerd@gnu.org>
parents: 27480
diff changeset
551 b = (struct buffer *) allocate_buffer ();
10314
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
552 b->size = sizeof (struct buffer) / sizeof (EMACS_INT);
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
553
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
554 if (XBUFFER (base_buffer)->base_buffer)
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
555 b->base_buffer = XBUFFER (base_buffer)->base_buffer;
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
556 else
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
557 b->base_buffer = XBUFFER (base_buffer);
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
558
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
559 /* Use the base buffer's text object. */
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
560 b->text = b->base_buffer->text;
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
561
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
562 BUF_BEGV (b) = BUF_BEGV (b->base_buffer);
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
563 BUF_ZV (b) = BUF_ZV (b->base_buffer);
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
564 BUF_PT (b) = BUF_PT (b->base_buffer);
20538
b964f3facafa (Fmake_indirect_buffer): Use set_marker_both.
Richard M. Stallman <rms@gnu.org>
parents: 20368
diff changeset
565 BUF_BEGV_BYTE (b) = BUF_BEGV_BYTE (b->base_buffer);
b964f3facafa (Fmake_indirect_buffer): Use set_marker_both.
Richard M. Stallman <rms@gnu.org>
parents: 20368
diff changeset
566 BUF_ZV_BYTE (b) = BUF_ZV_BYTE (b->base_buffer);
b964f3facafa (Fmake_indirect_buffer): Use set_marker_both.
Richard M. Stallman <rms@gnu.org>
parents: 20368
diff changeset
567 BUF_PT_BYTE (b) = BUF_PT_BYTE (b->base_buffer);
10314
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
568
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
569 b->newline_cache = 0;
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
570 b->width_run_cache = 0;
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
571 b->width_table = Qnil;
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
572
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
573 /* 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
574 b->next = all_buffers;
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
575 all_buffers = b;
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
576
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
577 name = Fcopy_sequence (name);
46378
ef7dc46ecd0b * buffer.c (Fget_buffer_create, Fmake_indirect_buffer): Use it.
Ken Raeburn <raeburn@raeburn.org>
parents: 46370
diff changeset
578 STRING_SET_INTERVALS (name, NULL_INTERVAL);
10314
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
579 b->name = name;
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
580
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
581 reset_buffer (b);
15776
6018e01d4466 (buffer_permanent_local_flags): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 15638
diff changeset
582 reset_buffer_local_variables (b, 1);
10314
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
583
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
584 /* 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
585 XSETBUFFER (buf, b);
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
586 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
587
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
588 b->mark = Fmake_marker ();
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
589 b->name = name;
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
590
24604
a9eb0deae6c0 (Fmake_indirect_buffer): Copy multibyte status from the base buffer.
Richard M. Stallman <rms@gnu.org>
parents: 24520
diff changeset
591 /* The multibyte status belongs to the base buffer. */
a9eb0deae6c0 (Fmake_indirect_buffer): Copy multibyte status from the base buffer.
Richard M. Stallman <rms@gnu.org>
parents: 24520
diff changeset
592 b->enable_multibyte_characters = b->base_buffer->enable_multibyte_characters;
a9eb0deae6c0 (Fmake_indirect_buffer): Copy multibyte status from the base buffer.
Richard M. Stallman <rms@gnu.org>
parents: 24520
diff changeset
593
10314
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
594 /* 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
595 if (NILP (b->base_buffer->pt_marker))
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
596 {
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
597 b->base_buffer->pt_marker = Fmake_marker ();
20538
b964f3facafa (Fmake_indirect_buffer): Use set_marker_both.
Richard M. Stallman <rms@gnu.org>
parents: 20368
diff changeset
598 set_marker_both (b->base_buffer->pt_marker, base_buffer,
b964f3facafa (Fmake_indirect_buffer): Use set_marker_both.
Richard M. Stallman <rms@gnu.org>
parents: 20368
diff changeset
599 BUF_PT (b->base_buffer),
b964f3facafa (Fmake_indirect_buffer): Use set_marker_both.
Richard M. Stallman <rms@gnu.org>
parents: 20368
diff changeset
600 BUF_PT_BYTE (b->base_buffer));
10314
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
601 }
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
602 if (NILP (b->base_buffer->begv_marker))
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
603 {
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
604 b->base_buffer->begv_marker = Fmake_marker ();
20538
b964f3facafa (Fmake_indirect_buffer): Use set_marker_both.
Richard M. Stallman <rms@gnu.org>
parents: 20368
diff changeset
605 set_marker_both (b->base_buffer->begv_marker, base_buffer,
b964f3facafa (Fmake_indirect_buffer): Use set_marker_both.
Richard M. Stallman <rms@gnu.org>
parents: 20368
diff changeset
606 BUF_BEGV (b->base_buffer),
b964f3facafa (Fmake_indirect_buffer): Use set_marker_both.
Richard M. Stallman <rms@gnu.org>
parents: 20368
diff changeset
607 BUF_BEGV_BYTE (b->base_buffer));
10314
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
608 }
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
609 if (NILP (b->base_buffer->zv_marker))
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
610 {
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
611 b->base_buffer->zv_marker = Fmake_marker ();
20538
b964f3facafa (Fmake_indirect_buffer): Use set_marker_both.
Richard M. Stallman <rms@gnu.org>
parents: 20368
diff changeset
612 set_marker_both (b->base_buffer->zv_marker, base_buffer,
b964f3facafa (Fmake_indirect_buffer): Use set_marker_both.
Richard M. Stallman <rms@gnu.org>
parents: 20368
diff changeset
613 BUF_ZV (b->base_buffer),
b964f3facafa (Fmake_indirect_buffer): Use set_marker_both.
Richard M. Stallman <rms@gnu.org>
parents: 20368
diff changeset
614 BUF_ZV_BYTE (b->base_buffer));
12998
404ae27d5148 (Fmake_indirect_buffer): Set the insertion_type of the zv_marker markers to 1.
Richard M. Stallman <rms@gnu.org>
parents: 12810
diff changeset
615 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
616 }
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
617
28625
5d68443d3df1 (clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28518
diff changeset
618 if (NILP (clone))
5d68443d3df1 (clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28518
diff changeset
619 {
5d68443d3df1 (clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28518
diff changeset
620 /* Give the indirect buffer markers for its narrowing. */
5d68443d3df1 (clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28518
diff changeset
621 b->pt_marker = Fmake_marker ();
5d68443d3df1 (clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28518
diff changeset
622 set_marker_both (b->pt_marker, buf, BUF_PT (b), BUF_PT_BYTE (b));
5d68443d3df1 (clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28518
diff changeset
623 b->begv_marker = Fmake_marker ();
5d68443d3df1 (clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28518
diff changeset
624 set_marker_both (b->begv_marker, buf, BUF_BEGV (b), BUF_BEGV_BYTE (b));
5d68443d3df1 (clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28518
diff changeset
625 b->zv_marker = Fmake_marker ();
5d68443d3df1 (clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28518
diff changeset
626 set_marker_both (b->zv_marker, buf, BUF_ZV (b), BUF_ZV_BYTE (b));
5d68443d3df1 (clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28518
diff changeset
627 XMARKER (b->zv_marker)->insertion_type = 1;
5d68443d3df1 (clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28518
diff changeset
628 }
5d68443d3df1 (clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28518
diff changeset
629 else
61445
9ee6093ffeaf (Fmake_indirect_buffer): Clear out some local variables.
Richard M. Stallman <rms@gnu.org>
parents: 60683
diff changeset
630 {
9ee6093ffeaf (Fmake_indirect_buffer): Clear out some local variables.
Richard M. Stallman <rms@gnu.org>
parents: 60683
diff changeset
631 struct buffer *old_b = current_buffer;
9ee6093ffeaf (Fmake_indirect_buffer): Clear out some local variables.
Richard M. Stallman <rms@gnu.org>
parents: 60683
diff changeset
632
9ee6093ffeaf (Fmake_indirect_buffer): Clear out some local variables.
Richard M. Stallman <rms@gnu.org>
parents: 60683
diff changeset
633 clone_per_buffer_values (b->base_buffer, b);
9ee6093ffeaf (Fmake_indirect_buffer): Clear out some local variables.
Richard M. Stallman <rms@gnu.org>
parents: 60683
diff changeset
634 b->filename = Qnil;
9ee6093ffeaf (Fmake_indirect_buffer): Clear out some local variables.
Richard M. Stallman <rms@gnu.org>
parents: 60683
diff changeset
635 b->file_truename = Qnil;
9ee6093ffeaf (Fmake_indirect_buffer): Clear out some local variables.
Richard M. Stallman <rms@gnu.org>
parents: 60683
diff changeset
636 b->display_count = make_number (0);
9ee6093ffeaf (Fmake_indirect_buffer): Clear out some local variables.
Richard M. Stallman <rms@gnu.org>
parents: 60683
diff changeset
637 b->backed_up = Qnil;
9ee6093ffeaf (Fmake_indirect_buffer): Clear out some local variables.
Richard M. Stallman <rms@gnu.org>
parents: 60683
diff changeset
638 b->auto_save_file_name = Qnil;
9ee6093ffeaf (Fmake_indirect_buffer): Clear out some local variables.
Richard M. Stallman <rms@gnu.org>
parents: 60683
diff changeset
639 set_buffer_internal_1 (b);
9ee6093ffeaf (Fmake_indirect_buffer): Clear out some local variables.
Richard M. Stallman <rms@gnu.org>
parents: 60683
diff changeset
640 Fset (intern ("buffer-save-without-query"), Qnil);
9ee6093ffeaf (Fmake_indirect_buffer): Clear out some local variables.
Richard M. Stallman <rms@gnu.org>
parents: 60683
diff changeset
641 Fset (intern ("buffer-file-number"), Qnil);
9ee6093ffeaf (Fmake_indirect_buffer): Clear out some local variables.
Richard M. Stallman <rms@gnu.org>
parents: 60683
diff changeset
642 Fset (intern ("buffer-stale-function"), Qnil);
9ee6093ffeaf (Fmake_indirect_buffer): Clear out some local variables.
Richard M. Stallman <rms@gnu.org>
parents: 60683
diff changeset
643 set_buffer_internal_1 (old_b);
9ee6093ffeaf (Fmake_indirect_buffer): Clear out some local variables.
Richard M. Stallman <rms@gnu.org>
parents: 60683
diff changeset
644 }
10314
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
645
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
646 return buf;
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
647 }
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
648
52012
d116f572d76b (delete_all_overlays): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51939
diff changeset
649 void
d116f572d76b (delete_all_overlays): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51939
diff changeset
650 delete_all_overlays (b)
d116f572d76b (delete_all_overlays): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51939
diff changeset
651 struct buffer *b;
d116f572d76b (delete_all_overlays): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51939
diff changeset
652 {
d116f572d76b (delete_all_overlays): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51939
diff changeset
653 Lisp_Object overlay;
d116f572d76b (delete_all_overlays): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51939
diff changeset
654
d116f572d76b (delete_all_overlays): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51939
diff changeset
655 /* `reset_buffer' blindly sets the list of overlays to NULL, so we
d116f572d76b (delete_all_overlays): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51939
diff changeset
656 have to empty the list, otherwise we end up with overlays that
d116f572d76b (delete_all_overlays): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51939
diff changeset
657 think they belong to this buffer while the buffer doesn't know about
d116f572d76b (delete_all_overlays): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51939
diff changeset
658 them any more. */
d116f572d76b (delete_all_overlays): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51939
diff changeset
659 while (b->overlays_before)
d116f572d76b (delete_all_overlays): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51939
diff changeset
660 {
d116f572d76b (delete_all_overlays): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51939
diff changeset
661 XSETMISC (overlay, b->overlays_before);
d116f572d76b (delete_all_overlays): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51939
diff changeset
662 Fdelete_overlay (overlay);
d116f572d76b (delete_all_overlays): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51939
diff changeset
663 }
d116f572d76b (delete_all_overlays): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51939
diff changeset
664 while (b->overlays_after)
d116f572d76b (delete_all_overlays): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51939
diff changeset
665 {
d116f572d76b (delete_all_overlays): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51939
diff changeset
666 XSETMISC (overlay, b->overlays_after);
d116f572d76b (delete_all_overlays): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51939
diff changeset
667 Fdelete_overlay (overlay);
d116f572d76b (delete_all_overlays): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51939
diff changeset
668 }
d116f572d76b (delete_all_overlays): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51939
diff changeset
669 eassert (b->overlays_before == NULL);
d116f572d76b (delete_all_overlays): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51939
diff changeset
670 eassert (b->overlays_after == NULL);
d116f572d76b (delete_all_overlays): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51939
diff changeset
671 }
d116f572d76b (delete_all_overlays): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51939
diff changeset
672
8873
b58ea8cae183 (reset_buffer): Don't call reset_buffer_local_variables.
Richard M. Stallman <rms@gnu.org>
parents: 8839
diff changeset
673 /* Reinitialize everything about a buffer except its name and contents
54834
9533e29b87e8 (Fmake_indirect_buffer): Throw an error if the intended base buffer
Luc Teirlinck <teirllm@auburn.edu>
parents: 54819
diff changeset
674 and local variables.
52012
d116f572d76b (delete_all_overlays): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51939
diff changeset
675 If called on an already-initialized buffer, the list of overlays
d116f572d76b (delete_all_overlays): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51939
diff changeset
676 should be deleted before calling this function, otherwise we end up
d116f572d76b (delete_all_overlays): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51939
diff changeset
677 with overlays that claim to belong to the buffer but the buffer
d116f572d76b (delete_all_overlays): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51939
diff changeset
678 claims it doesn't belong to it. */
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
679
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
680 void
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
681 reset_buffer (b)
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
682 register struct buffer *b;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
683 {
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
684 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
685 b->file_truename = Qnil;
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
686 b->directory = (current_buffer) ? current_buffer->directory : Qnil;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
687 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
688 XSETFASTINT (b->save_length, 0);
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
689 b->last_window_start = 1;
17566
7ed40081342f (reset_buffer): Initialize clip_changed field.
Richard M. Stallman <rms@gnu.org>
parents: 17238
diff changeset
690 /* It is more conservative to start out "changed" than "unchanged". */
25368
f9949db6ca7d (set_buffer_internal): Set windows_or_buffers_changed
Gerd Moellmann <gerd@gnu.org>
parents: 25351
diff changeset
691 b->clip_changed = 0;
f9949db6ca7d (set_buffer_internal): Set windows_or_buffers_changed
Gerd Moellmann <gerd@gnu.org>
parents: 25351
diff changeset
692 b->prevent_redisplay_optimizations_p = 1;
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
693 b->backed_up = Qnil;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
694 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
695 b->auto_save_failure_time = -1;
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
696 b->auto_save_file_name = Qnil;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
697 b->read_only = Qnil;
51844
c5036e7cc93b (overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51827
diff changeset
698 b->overlays_before = NULL;
c5036e7cc93b (overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51827
diff changeset
699 b->overlays_after = NULL;
51824
9f5665eb77bd (reset_buffer, recenter_overlay_lists)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51782
diff changeset
700 b->overlay_center = BEG;
3242
f873e6b9af52 (reset_buffer): Clear mark_active field here.
Richard M. Stallman <rms@gnu.org>
parents: 3226
diff changeset
701 b->mark_active = Qnil;
10561
53f34c870201 (init_buffer_once, syms_of_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 10505
diff changeset
702 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
703 b->file_format = Qnil;
56976
b3aa8cb4c381 (reset_buffer, init_buffer_once): Handle auto_save_file_format field.
Luc Teirlinck <teirllm@auburn.edu>
parents: 56669
diff changeset
704 b->auto_save_file_format = Qt;
16067
5c9f298c9875 (reset_buffer): Initialize last_selected_window slot.
Richard M. Stallman <rms@gnu.org>
parents: 16051
diff changeset
705 b->last_selected_window = Qnil;
17218
a57ca25e9c62 (reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents: 17124
diff changeset
706 XSETINT (b->display_count, 0);
22150
b6edeb61a779 (syms_of_buffer): Set up Lisp variable buffer-display-time.
Richard M. Stallman <rms@gnu.org>
parents: 22023
diff changeset
707 b->display_time = Qnil;
20995
abc60038dd2b (syms_of_buffer): enable-multibyte-characters is read-only.
Karl Heuer <kwzh@gnu.org>
parents: 20935
diff changeset
708 b->enable_multibyte_characters = buffer_defaults.enable_multibyte_characters;
28322
986882bafaf1 (reset_buffer): Initialize buffer's cursor_type.
Gerd Moellmann <gerd@gnu.org>
parents: 28314
diff changeset
709 b->cursor_type = buffer_defaults.cursor_type;
28688
3c44b2f54f82 (init_buffer_once): Handle extra_line_spacing.
Gerd Moellmann <gerd@gnu.org>
parents: 28636
diff changeset
710 b->extra_line_spacing = buffer_defaults.extra_line_spacing;
42088
11a505aa1322 (reset_buffer): Initialize `display_error_modiff'.
Richard M. Stallman <rms@gnu.org>
parents: 41524
diff changeset
711
11a505aa1322 (reset_buffer): Initialize `display_error_modiff'.
Richard M. Stallman <rms@gnu.org>
parents: 41524
diff changeset
712 b->display_error_modiff = 0;
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
713 }
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
714
8873
b58ea8cae183 (reset_buffer): Don't call reset_buffer_local_variables.
Richard M. Stallman <rms@gnu.org>
parents: 8839
diff changeset
715 /* 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
716 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
717 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
718 Instead, use Fkill_all_local_variables.
6018e01d4466 (buffer_permanent_local_flags): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 15638
diff changeset
719
6018e01d4466 (buffer_permanent_local_flags): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 15638
diff changeset
720 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
721 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
722 we preserve those. */
6018e01d4466 (buffer_permanent_local_flags): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 15638
diff changeset
723
6018e01d4466 (buffer_permanent_local_flags): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 15638
diff changeset
724 static void
6018e01d4466 (buffer_permanent_local_flags): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 15638
diff changeset
725 reset_buffer_local_variables (b, permanent_too)
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
726 register struct buffer *b;
15776
6018e01d4466 (buffer_permanent_local_flags): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 15638
diff changeset
727 int permanent_too;
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
728 {
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
729 register int offset;
28314
c46e609d887a (buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents: 28207
diff changeset
730 int i;
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
731
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
732 /* Reset the major mode to Fundamental, together with all the
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
733 things that depend on the major mode.
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
734 default-major-mode is handled at a higher level.
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
735 We ignore it here. */
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
736 b->major_mode = Qfundamental_mode;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
737 b->keymap = Qnil;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
738 b->mode_name = QSFundamental;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
739 b->minor_modes = Qnil;
13270
76e69b0af94d (reset_buffer_local_variables): Call
Richard M. Stallman <rms@gnu.org>
parents: 13263
diff changeset
740
76e69b0af94d (reset_buffer_local_variables): Call
Richard M. Stallman <rms@gnu.org>
parents: 13263
diff changeset
741 /* 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
742 fix up its insides first. */
76e69b0af94d (reset_buffer_local_variables): Call
Richard M. Stallman <rms@gnu.org>
parents: 13263
diff changeset
743 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
744 && 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
745 && 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
746 Fset_standard_case_table (Vascii_downcase_table);
76e69b0af94d (reset_buffer_local_variables): Call
Richard M. Stallman <rms@gnu.org>
parents: 13263
diff changeset
747
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
748 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
749 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
750 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
751 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
752 b->invisibility_spec = Qt;
15786
f2d0e8928d57 (buffer_permanent_local_flags): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 15776
diff changeset
753 #ifndef DOS_NT
f2d0e8928d57 (buffer_permanent_local_flags): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 15776
diff changeset
754 b->buffer_file_type = Qnil;
f2d0e8928d57 (buffer_permanent_local_flags): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 15776
diff changeset
755 #endif
10967
b53b84b6f46d (reset_buffer_local_variables): Init invisibility.
Richard M. Stallman <rms@gnu.org>
parents: 10916
diff changeset
756
15776
6018e01d4466 (buffer_permanent_local_flags): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 15638
diff changeset
757 /* Reset all (or most) per-buffer variables to their defaults. */
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
758 b->local_var_alist = Qnil;
28352
1555145f8c35 (buffer_permanent_local_flags): Use MAX_PER_BUFFER_VARS
Gerd Moellmann <gerd@gnu.org>
parents: 28332
diff changeset
759 for (i = 0; i < last_per_buffer_idx; ++i)
28314
c46e609d887a (buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents: 28207
diff changeset
760 if (permanent_too || buffer_permanent_local_flags[i] == 0)
28352
1555145f8c35 (buffer_permanent_local_flags): Use MAX_PER_BUFFER_VARS
Gerd Moellmann <gerd@gnu.org>
parents: 28332
diff changeset
761 SET_PER_BUFFER_VALUE_P (b, i, 0);
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
762
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
763 /* For each slot that has a default value,
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
764 copy that into the slot. */
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
765
28352
1555145f8c35 (buffer_permanent_local_flags): Use MAX_PER_BUFFER_VARS
Gerd Moellmann <gerd@gnu.org>
parents: 28332
diff changeset
766 for (offset = PER_BUFFER_VAR_OFFSET (name);
28314
c46e609d887a (buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents: 28207
diff changeset
767 offset < sizeof *b;
c46e609d887a (buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents: 28207
diff changeset
768 offset += sizeof (Lisp_Object))
9362
f6dc29e7e986 (init_buffer_once): Don't use XSETFASTINT when negative.
Karl Heuer <kwzh@gnu.org>
parents: 9335
diff changeset
769 {
28352
1555145f8c35 (buffer_permanent_local_flags): Use MAX_PER_BUFFER_VARS
Gerd Moellmann <gerd@gnu.org>
parents: 28332
diff changeset
770 int idx = PER_BUFFER_IDX (offset);
28314
c46e609d887a (buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents: 28207
diff changeset
771 if ((idx > 0
c46e609d887a (buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents: 28207
diff changeset
772 && (permanent_too
c46e609d887a (buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents: 28207
diff changeset
773 || buffer_permanent_local_flags[idx] == 0))
c46e609d887a (buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents: 28207
diff changeset
774 /* Is -2 used anywhere? */
c46e609d887a (buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents: 28207
diff changeset
775 || idx == -2)
28352
1555145f8c35 (buffer_permanent_local_flags): Use MAX_PER_BUFFER_VARS
Gerd Moellmann <gerd@gnu.org>
parents: 28332
diff changeset
776 PER_BUFFER_VALUE (b, offset) = PER_BUFFER_DEFAULT (offset);
9362
f6dc29e7e986 (init_buffer_once): Don't use XSETFASTINT when negative.
Karl Heuer <kwzh@gnu.org>
parents: 9335
diff changeset
777 }
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
778 }
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
779
392
dce611246f59 *** empty log message ***
Roland McGrath <roland@gnu.org>
parents: 333
diff changeset
780 /* We split this away from generate-new-buffer, because rename-buffer
dce611246f59 *** empty log message ***
Roland McGrath <roland@gnu.org>
parents: 333
diff changeset
781 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
782 rename the buffer properly. */
dce611246f59 *** empty log message ***
Roland McGrath <roland@gnu.org>
parents: 333
diff changeset
783
dce611246f59 *** empty log message ***
Roland McGrath <roland@gnu.org>
parents: 333
diff changeset
784 DEFUN ("generate-new-buffer-name", Fgenerate_new_buffer_name, Sgenerate_new_buffer_name,
40108
6084dfa5f85d Reindent DEFUNs and DEFVARs woth doc: keywords.
Pavel Janík <Pavel@Janik.cz>
parents: 39988
diff changeset
785 1, 2, 0,
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39974
diff changeset
786 doc: /* Return a string that is the name of no existing buffer based on NAME.
39971
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
787 If there is no live buffer named NAME, then return NAME.
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
788 Otherwise modify name by appending `<NUMBER>', incrementing NUMBER
54786
870b7a6bffb8 (Fgenerate_new_buffer_name): Return NAME argument if IGNORE argument
Luc Teirlinck <teirllm@auburn.edu>
parents: 54772
diff changeset
789 \(starting at 2) until an unused name is found, and then return that name.
39971
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
790 Optional second argument IGNORE specifies a name that is okay to use
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
791 \(if it is in the sequence to be tried)
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39974
diff changeset
792 even if a buffer with that name exists. */)
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39974
diff changeset
793 (name, ignore)
3226
bc4beddaf2c7 (Fgenerate_new_buffer_name): New arg IGNORE.
Richard M. Stallman <rms@gnu.org>
parents: 3204
diff changeset
794 register Lisp_Object name, ignore;
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
795 {
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
796 register Lisp_Object gentemp, tem;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
797 int count;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
798 char number[10];
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
799
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40605
diff changeset
800 CHECK_STRING (name);
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
801
54786
870b7a6bffb8 (Fgenerate_new_buffer_name): Return NAME argument if IGNORE argument
Luc Teirlinck <teirllm@auburn.edu>
parents: 54772
diff changeset
802 tem = Fstring_equal (name, ignore);
870b7a6bffb8 (Fgenerate_new_buffer_name): Return NAME argument if IGNORE argument
Luc Teirlinck <teirllm@auburn.edu>
parents: 54772
diff changeset
803 if (!NILP (tem))
870b7a6bffb8 (Fgenerate_new_buffer_name): Return NAME argument if IGNORE argument
Luc Teirlinck <teirllm@auburn.edu>
parents: 54772
diff changeset
804 return name;
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
805 tem = Fget_buffer (name);
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 392
diff changeset
806 if (NILP (tem))
392
dce611246f59 *** empty log message ***
Roland McGrath <roland@gnu.org>
parents: 333
diff changeset
807 return name;
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
808
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
809 count = 1;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
810 while (1)
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
811 {
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
812 sprintf (number, "<%d>", ++count);
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
813 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
814 tem = Fstring_equal (gentemp, ignore);
3226
bc4beddaf2c7 (Fgenerate_new_buffer_name): New arg IGNORE.
Richard M. Stallman <rms@gnu.org>
parents: 3204
diff changeset
815 if (!NILP (tem))
bc4beddaf2c7 (Fgenerate_new_buffer_name): New arg IGNORE.
Richard M. Stallman <rms@gnu.org>
parents: 3204
diff changeset
816 return gentemp;
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
817 tem = Fget_buffer (gentemp);
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 392
diff changeset
818 if (NILP (tem))
392
dce611246f59 *** empty log message ***
Roland McGrath <roland@gnu.org>
parents: 333
diff changeset
819 return gentemp;
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
820 }
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
821 }
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
822
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
823
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
824 DEFUN ("buffer-name", Fbuffer_name, Sbuffer_name, 0, 1, 0,
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39974
diff changeset
825 doc: /* Return the name of BUFFER, as a string.
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39974
diff changeset
826 With no argument or nil as argument, return the name of the current buffer. */)
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39974
diff changeset
827 (buffer)
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
828 register Lisp_Object buffer;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
829 {
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 392
diff changeset
830 if (NILP (buffer))
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
831 return current_buffer->name;
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40605
diff changeset
832 CHECK_BUFFER (buffer);
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
833 return XBUFFER (buffer)->name;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
834 }
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
835
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
836 DEFUN ("buffer-file-name", Fbuffer_file_name, Sbuffer_file_name, 0, 1, 0,
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39974
diff changeset
837 doc: /* Return name of file BUFFER is visiting, or nil if none.
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39974
diff changeset
838 No argument or nil as argument means use the current buffer. */)
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39974
diff changeset
839 (buffer)
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
840 register Lisp_Object buffer;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
841 {
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 392
diff changeset
842 if (NILP (buffer))
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
843 return current_buffer->filename;
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40605
diff changeset
844 CHECK_BUFFER (buffer);
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
845 return XBUFFER (buffer)->filename;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
846 }
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
847
10314
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
848 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
849 0, 1, 0,
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39974
diff changeset
850 doc: /* Return the base buffer of indirect buffer BUFFER.
54949
95d283fb2215 (Fbuffer_base_buffer): Doc fix.
Luc Teirlinck <teirllm@auburn.edu>
parents: 54834
diff changeset
851 If BUFFER is not indirect, return nil.
95d283fb2215 (Fbuffer_base_buffer): Doc fix.
Luc Teirlinck <teirllm@auburn.edu>
parents: 54834
diff changeset
852 BUFFER defaults to the current buffer. */)
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39974
diff changeset
853 (buffer)
10314
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
854 register Lisp_Object buffer;
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
855 {
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
856 struct buffer *base;
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
857 Lisp_Object base_buffer;
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
858
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
859 if (NILP (buffer))
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
860 base = current_buffer->base_buffer;
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
861 else
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
862 {
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40605
diff changeset
863 CHECK_BUFFER (buffer);
10314
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
864 base = XBUFFER (buffer)->base_buffer;
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
865 }
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
866
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
867 if (! base)
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
868 return Qnil;
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
869 XSETBUFFER (base_buffer, base);
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
870 return base_buffer;
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
871 }
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
872
40725
a8af2e89346c (Fbuffer_local_value): New function.
Richard M. Stallman <rms@gnu.org>
parents: 40656
diff changeset
873 DEFUN ("buffer-local-value", Fbuffer_local_value,
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49444
diff changeset
874 Sbuffer_local_value, 2, 2, 0,
40725
a8af2e89346c (Fbuffer_local_value): New function.
Richard M. Stallman <rms@gnu.org>
parents: 40656
diff changeset
875 doc: /* Return the value of VARIABLE in BUFFER.
a8af2e89346c (Fbuffer_local_value): New function.
Richard M. Stallman <rms@gnu.org>
parents: 40656
diff changeset
876 If VARIABLE does not have a buffer-local binding in BUFFER, the value
62793
71f6142fcfb9 (Fbuffer_local_value): Make argument name match its use in docstring.
Juanma Barranquero <lekktu@gmail.com>
parents: 62069
diff changeset
877 is the default binding of the variable. */)
71f6142fcfb9 (Fbuffer_local_value): Make argument name match its use in docstring.
Juanma Barranquero <lekktu@gmail.com>
parents: 62069
diff changeset
878 (variable, buffer)
71f6142fcfb9 (Fbuffer_local_value): Make argument name match its use in docstring.
Juanma Barranquero <lekktu@gmail.com>
parents: 62069
diff changeset
879 register Lisp_Object variable;
40725
a8af2e89346c (Fbuffer_local_value): New function.
Richard M. Stallman <rms@gnu.org>
parents: 40656
diff changeset
880 register Lisp_Object buffer;
a8af2e89346c (Fbuffer_local_value): New function.
Richard M. Stallman <rms@gnu.org>
parents: 40656
diff changeset
881 {
a8af2e89346c (Fbuffer_local_value): New function.
Richard M. Stallman <rms@gnu.org>
parents: 40656
diff changeset
882 register struct buffer *buf;
a8af2e89346c (Fbuffer_local_value): New function.
Richard M. Stallman <rms@gnu.org>
parents: 40656
diff changeset
883 register Lisp_Object result;
a8af2e89346c (Fbuffer_local_value): New function.
Richard M. Stallman <rms@gnu.org>
parents: 40656
diff changeset
884
62793
71f6142fcfb9 (Fbuffer_local_value): Make argument name match its use in docstring.
Juanma Barranquero <lekktu@gmail.com>
parents: 62069
diff changeset
885 CHECK_SYMBOL (variable);
40735
d3065bec433f (Fbuffer_local_value): Remove extra args from CHECK_SYMBOL and CHECK_BUFFER.
Richard M. Stallman <rms@gnu.org>
parents: 40725
diff changeset
886 CHECK_BUFFER (buffer);
40725
a8af2e89346c (Fbuffer_local_value): New function.
Richard M. Stallman <rms@gnu.org>
parents: 40656
diff changeset
887 buf = XBUFFER (buffer);
a8af2e89346c (Fbuffer_local_value): New function.
Richard M. Stallman <rms@gnu.org>
parents: 40656
diff changeset
888
62855
5ef5c45c0187 (Fbuffer_local_value): Call indirect_variable.
Richard M. Stallman <rms@gnu.org>
parents: 62793
diff changeset
889 if (SYMBOLP (variable))
5ef5c45c0187 (Fbuffer_local_value): Call indirect_variable.
Richard M. Stallman <rms@gnu.org>
parents: 62793
diff changeset
890 variable = indirect_variable (variable);
5ef5c45c0187 (Fbuffer_local_value): Call indirect_variable.
Richard M. Stallman <rms@gnu.org>
parents: 62793
diff changeset
891
40725
a8af2e89346c (Fbuffer_local_value): New function.
Richard M. Stallman <rms@gnu.org>
parents: 40656
diff changeset
892 /* Look in local_var_list */
62793
71f6142fcfb9 (Fbuffer_local_value): Make argument name match its use in docstring.
Juanma Barranquero <lekktu@gmail.com>
parents: 62069
diff changeset
893 result = Fassoc (variable, buf->local_var_alist);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49444
diff changeset
894 if (NILP (result))
40725
a8af2e89346c (Fbuffer_local_value): New function.
Richard M. Stallman <rms@gnu.org>
parents: 40656
diff changeset
895 {
a8af2e89346c (Fbuffer_local_value): New function.
Richard M. Stallman <rms@gnu.org>
parents: 40656
diff changeset
896 int offset, idx;
a8af2e89346c (Fbuffer_local_value): New function.
Richard M. Stallman <rms@gnu.org>
parents: 40656
diff changeset
897 int found = 0;
a8af2e89346c (Fbuffer_local_value): New function.
Richard M. Stallman <rms@gnu.org>
parents: 40656
diff changeset
898
a8af2e89346c (Fbuffer_local_value): New function.
Richard M. Stallman <rms@gnu.org>
parents: 40656
diff changeset
899 /* Look in special slots */
a8af2e89346c (Fbuffer_local_value): New function.
Richard M. Stallman <rms@gnu.org>
parents: 40656
diff changeset
900 for (offset = PER_BUFFER_VAR_OFFSET (name);
a8af2e89346c (Fbuffer_local_value): New function.
Richard M. Stallman <rms@gnu.org>
parents: 40656
diff changeset
901 offset < sizeof (struct buffer);
a8af2e89346c (Fbuffer_local_value): New function.
Richard M. Stallman <rms@gnu.org>
parents: 40656
diff changeset
902 /* sizeof EMACS_INT == sizeof Lisp_Object */
a8af2e89346c (Fbuffer_local_value): New function.
Richard M. Stallman <rms@gnu.org>
parents: 40656
diff changeset
903 offset += (sizeof (EMACS_INT)))
a8af2e89346c (Fbuffer_local_value): New function.
Richard M. Stallman <rms@gnu.org>
parents: 40656
diff changeset
904 {
a8af2e89346c (Fbuffer_local_value): New function.
Richard M. Stallman <rms@gnu.org>
parents: 40656
diff changeset
905 idx = PER_BUFFER_IDX (offset);
a8af2e89346c (Fbuffer_local_value): New function.
Richard M. Stallman <rms@gnu.org>
parents: 40656
diff changeset
906 if ((idx == -1 || PER_BUFFER_VALUE_P (buf, idx))
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49444
diff changeset
907 && SYMBOLP (PER_BUFFER_SYMBOL (offset))
62793
71f6142fcfb9 (Fbuffer_local_value): Make argument name match its use in docstring.
Juanma Barranquero <lekktu@gmail.com>
parents: 62069
diff changeset
908 && EQ (PER_BUFFER_SYMBOL (offset), variable))
40725
a8af2e89346c (Fbuffer_local_value): New function.
Richard M. Stallman <rms@gnu.org>
parents: 40656
diff changeset
909 {
a8af2e89346c (Fbuffer_local_value): New function.
Richard M. Stallman <rms@gnu.org>
parents: 40656
diff changeset
910 result = PER_BUFFER_VALUE (buf, offset);
a8af2e89346c (Fbuffer_local_value): New function.
Richard M. Stallman <rms@gnu.org>
parents: 40656
diff changeset
911 found = 1;
a8af2e89346c (Fbuffer_local_value): New function.
Richard M. Stallman <rms@gnu.org>
parents: 40656
diff changeset
912 break;
a8af2e89346c (Fbuffer_local_value): New function.
Richard M. Stallman <rms@gnu.org>
parents: 40656
diff changeset
913 }
a8af2e89346c (Fbuffer_local_value): New function.
Richard M. Stallman <rms@gnu.org>
parents: 40656
diff changeset
914 }
a8af2e89346c (Fbuffer_local_value): New function.
Richard M. Stallman <rms@gnu.org>
parents: 40656
diff changeset
915
a8af2e89346c (Fbuffer_local_value): New function.
Richard M. Stallman <rms@gnu.org>
parents: 40656
diff changeset
916 if (!found)
62793
71f6142fcfb9 (Fbuffer_local_value): Make argument name match its use in docstring.
Juanma Barranquero <lekktu@gmail.com>
parents: 62069
diff changeset
917 result = Fdefault_value (variable);
40725
a8af2e89346c (Fbuffer_local_value): New function.
Richard M. Stallman <rms@gnu.org>
parents: 40656
diff changeset
918 }
a8af2e89346c (Fbuffer_local_value): New function.
Richard M. Stallman <rms@gnu.org>
parents: 40656
diff changeset
919 else
46199
ca604a52d267 (Fbuffer_local_value): Store current value into its binding
Richard M. Stallman <rms@gnu.org>
parents: 46016
diff changeset
920 {
ca604a52d267 (Fbuffer_local_value): Store current value into its binding
Richard M. Stallman <rms@gnu.org>
parents: 46016
diff changeset
921 Lisp_Object valcontents;
ca604a52d267 (Fbuffer_local_value): Store current value into its binding
Richard M. Stallman <rms@gnu.org>
parents: 46016
diff changeset
922 Lisp_Object current_alist_element;
ca604a52d267 (Fbuffer_local_value): Store current value into its binding
Richard M. Stallman <rms@gnu.org>
parents: 46016
diff changeset
923
ca604a52d267 (Fbuffer_local_value): Store current value into its binding
Richard M. Stallman <rms@gnu.org>
parents: 46016
diff changeset
924 /* What binding is loaded right now? */
62793
71f6142fcfb9 (Fbuffer_local_value): Make argument name match its use in docstring.
Juanma Barranquero <lekktu@gmail.com>
parents: 62069
diff changeset
925 valcontents = SYMBOL_VALUE (variable);
46199
ca604a52d267 (Fbuffer_local_value): Store current value into its binding
Richard M. Stallman <rms@gnu.org>
parents: 46016
diff changeset
926 current_alist_element
ca604a52d267 (Fbuffer_local_value): Store current value into its binding
Richard M. Stallman <rms@gnu.org>
parents: 46016
diff changeset
927 = XCAR (XBUFFER_LOCAL_VALUE (valcontents)->cdr);
ca604a52d267 (Fbuffer_local_value): Store current value into its binding
Richard M. Stallman <rms@gnu.org>
parents: 46016
diff changeset
928
ca604a52d267 (Fbuffer_local_value): Store current value into its binding
Richard M. Stallman <rms@gnu.org>
parents: 46016
diff changeset
929 /* The value of the currently loaded binding is not
ca604a52d267 (Fbuffer_local_value): Store current value into its binding
Richard M. Stallman <rms@gnu.org>
parents: 46016
diff changeset
930 stored in it, but rather in the realvalue slot.
ca604a52d267 (Fbuffer_local_value): Store current value into its binding
Richard M. Stallman <rms@gnu.org>
parents: 46016
diff changeset
931 Store that value into the binding it belongs to
ca604a52d267 (Fbuffer_local_value): Store current value into its binding
Richard M. Stallman <rms@gnu.org>
parents: 46016
diff changeset
932 in case that is the one we are about to use. */
ca604a52d267 (Fbuffer_local_value): Store current value into its binding
Richard M. Stallman <rms@gnu.org>
parents: 46016
diff changeset
933
ca604a52d267 (Fbuffer_local_value): Store current value into its binding
Richard M. Stallman <rms@gnu.org>
parents: 46016
diff changeset
934 Fsetcdr (current_alist_element,
ca604a52d267 (Fbuffer_local_value): Store current value into its binding
Richard M. Stallman <rms@gnu.org>
parents: 46016
diff changeset
935 do_symval_forwarding (XBUFFER_LOCAL_VALUE (valcontents)->realvalue));
ca604a52d267 (Fbuffer_local_value): Store current value into its binding
Richard M. Stallman <rms@gnu.org>
parents: 46016
diff changeset
936
ca604a52d267 (Fbuffer_local_value): Store current value into its binding
Richard M. Stallman <rms@gnu.org>
parents: 46016
diff changeset
937 /* Now get the (perhaps updated) value out of the binding. */
ca604a52d267 (Fbuffer_local_value): Store current value into its binding
Richard M. Stallman <rms@gnu.org>
parents: 46016
diff changeset
938 result = XCDR (result);
ca604a52d267 (Fbuffer_local_value): Store current value into its binding
Richard M. Stallman <rms@gnu.org>
parents: 46016
diff changeset
939 }
40725
a8af2e89346c (Fbuffer_local_value): New function.
Richard M. Stallman <rms@gnu.org>
parents: 40656
diff changeset
940
a8af2e89346c (Fbuffer_local_value): New function.
Richard M. Stallman <rms@gnu.org>
parents: 40656
diff changeset
941 if (EQ (result, Qunbound))
62793
71f6142fcfb9 (Fbuffer_local_value): Make argument name match its use in docstring.
Juanma Barranquero <lekktu@gmail.com>
parents: 62069
diff changeset
942 return Fsignal (Qvoid_variable, Fcons (variable, Qnil));
40725
a8af2e89346c (Fbuffer_local_value): New function.
Richard M. Stallman <rms@gnu.org>
parents: 40656
diff changeset
943
a8af2e89346c (Fbuffer_local_value): New function.
Richard M. Stallman <rms@gnu.org>
parents: 40656
diff changeset
944 return result;
a8af2e89346c (Fbuffer_local_value): New function.
Richard M. Stallman <rms@gnu.org>
parents: 40656
diff changeset
945 }
a8af2e89346c (Fbuffer_local_value): New function.
Richard M. Stallman <rms@gnu.org>
parents: 40656
diff changeset
946
60683
d2f6fa8790f3 (buffer_lisp_local_variables): New function,
Richard M. Stallman <rms@gnu.org>
parents: 60248
diff changeset
947 /* Return an alist of the Lisp-level buffer-local bindings of
61445
9ee6093ffeaf (Fmake_indirect_buffer): Clear out some local variables.
Richard M. Stallman <rms@gnu.org>
parents: 60683
diff changeset
948 buffer BUF. That is, don't include the variables maintained
60683
d2f6fa8790f3 (buffer_lisp_local_variables): New function,
Richard M. Stallman <rms@gnu.org>
parents: 60248
diff changeset
949 in special slots in the buffer object. */
d2f6fa8790f3 (buffer_lisp_local_variables): New function,
Richard M. Stallman <rms@gnu.org>
parents: 60248
diff changeset
950
d2f6fa8790f3 (buffer_lisp_local_variables): New function,
Richard M. Stallman <rms@gnu.org>
parents: 60248
diff changeset
951 static Lisp_Object
d2f6fa8790f3 (buffer_lisp_local_variables): New function,
Richard M. Stallman <rms@gnu.org>
parents: 60248
diff changeset
952 buffer_lisp_local_variables (buf)
d2f6fa8790f3 (buffer_lisp_local_variables): New function,
Richard M. Stallman <rms@gnu.org>
parents: 60248
diff changeset
953 struct buffer *buf;
d2f6fa8790f3 (buffer_lisp_local_variables): New function,
Richard M. Stallman <rms@gnu.org>
parents: 60248
diff changeset
954 {
d2f6fa8790f3 (buffer_lisp_local_variables): New function,
Richard M. Stallman <rms@gnu.org>
parents: 60248
diff changeset
955 Lisp_Object result = Qnil;
d2f6fa8790f3 (buffer_lisp_local_variables): New function,
Richard M. Stallman <rms@gnu.org>
parents: 60248
diff changeset
956 register Lisp_Object tail;
d2f6fa8790f3 (buffer_lisp_local_variables): New function,
Richard M. Stallman <rms@gnu.org>
parents: 60248
diff changeset
957 for (tail = buf->local_var_alist; CONSP (tail); tail = XCDR (tail))
d2f6fa8790f3 (buffer_lisp_local_variables): New function,
Richard M. Stallman <rms@gnu.org>
parents: 60248
diff changeset
958 {
d2f6fa8790f3 (buffer_lisp_local_variables): New function,
Richard M. Stallman <rms@gnu.org>
parents: 60248
diff changeset
959 Lisp_Object val, elt;
d2f6fa8790f3 (buffer_lisp_local_variables): New function,
Richard M. Stallman <rms@gnu.org>
parents: 60248
diff changeset
960
d2f6fa8790f3 (buffer_lisp_local_variables): New function,
Richard M. Stallman <rms@gnu.org>
parents: 60248
diff changeset
961 elt = XCAR (tail);
d2f6fa8790f3 (buffer_lisp_local_variables): New function,
Richard M. Stallman <rms@gnu.org>
parents: 60248
diff changeset
962
d2f6fa8790f3 (buffer_lisp_local_variables): New function,
Richard M. Stallman <rms@gnu.org>
parents: 60248
diff changeset
963 /* Reference each variable in the alist in buf.
d2f6fa8790f3 (buffer_lisp_local_variables): New function,
Richard M. Stallman <rms@gnu.org>
parents: 60248
diff changeset
964 If inquiring about the current buffer, this gets the current values,
d2f6fa8790f3 (buffer_lisp_local_variables): New function,
Richard M. Stallman <rms@gnu.org>
parents: 60248
diff changeset
965 so store them into the alist so the alist is up to date.
d2f6fa8790f3 (buffer_lisp_local_variables): New function,
Richard M. Stallman <rms@gnu.org>
parents: 60248
diff changeset
966 If inquiring about some other buffer, this swaps out any values
d2f6fa8790f3 (buffer_lisp_local_variables): New function,
Richard M. Stallman <rms@gnu.org>
parents: 60248
diff changeset
967 for that buffer, making the alist up to date automatically. */
d2f6fa8790f3 (buffer_lisp_local_variables): New function,
Richard M. Stallman <rms@gnu.org>
parents: 60248
diff changeset
968 val = find_symbol_value (XCAR (elt));
d2f6fa8790f3 (buffer_lisp_local_variables): New function,
Richard M. Stallman <rms@gnu.org>
parents: 60248
diff changeset
969 /* Use the current buffer value only if buf is the current buffer. */
d2f6fa8790f3 (buffer_lisp_local_variables): New function,
Richard M. Stallman <rms@gnu.org>
parents: 60248
diff changeset
970 if (buf != current_buffer)
d2f6fa8790f3 (buffer_lisp_local_variables): New function,
Richard M. Stallman <rms@gnu.org>
parents: 60248
diff changeset
971 val = XCDR (elt);
d2f6fa8790f3 (buffer_lisp_local_variables): New function,
Richard M. Stallman <rms@gnu.org>
parents: 60248
diff changeset
972
d2f6fa8790f3 (buffer_lisp_local_variables): New function,
Richard M. Stallman <rms@gnu.org>
parents: 60248
diff changeset
973 /* If symbol is unbound, put just the symbol in the list. */
d2f6fa8790f3 (buffer_lisp_local_variables): New function,
Richard M. Stallman <rms@gnu.org>
parents: 60248
diff changeset
974 if (EQ (val, Qunbound))
d2f6fa8790f3 (buffer_lisp_local_variables): New function,
Richard M. Stallman <rms@gnu.org>
parents: 60248
diff changeset
975 result = Fcons (XCAR (elt), result);
d2f6fa8790f3 (buffer_lisp_local_variables): New function,
Richard M. Stallman <rms@gnu.org>
parents: 60248
diff changeset
976 /* Otherwise, put (symbol . value) in the list. */
d2f6fa8790f3 (buffer_lisp_local_variables): New function,
Richard M. Stallman <rms@gnu.org>
parents: 60248
diff changeset
977 else
d2f6fa8790f3 (buffer_lisp_local_variables): New function,
Richard M. Stallman <rms@gnu.org>
parents: 60248
diff changeset
978 result = Fcons (Fcons (XCAR (elt), val), result);
d2f6fa8790f3 (buffer_lisp_local_variables): New function,
Richard M. Stallman <rms@gnu.org>
parents: 60248
diff changeset
979 }
d2f6fa8790f3 (buffer_lisp_local_variables): New function,
Richard M. Stallman <rms@gnu.org>
parents: 60248
diff changeset
980
d2f6fa8790f3 (buffer_lisp_local_variables): New function,
Richard M. Stallman <rms@gnu.org>
parents: 60248
diff changeset
981 return result;
d2f6fa8790f3 (buffer_lisp_local_variables): New function,
Richard M. Stallman <rms@gnu.org>
parents: 60248
diff changeset
982 }
d2f6fa8790f3 (buffer_lisp_local_variables): New function,
Richard M. Stallman <rms@gnu.org>
parents: 60248
diff changeset
983
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
984 DEFUN ("buffer-local-variables", Fbuffer_local_variables,
40108
6084dfa5f85d Reindent DEFUNs and DEFVARs woth doc: keywords.
Pavel Janík <Pavel@Janik.cz>
parents: 39988
diff changeset
985 Sbuffer_local_variables, 0, 1, 0,
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39974
diff changeset
986 doc: /* Return an alist of variables that are buffer-local in BUFFER.
39971
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
987 Most elements look like (SYMBOL . VALUE), describing one variable.
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
988 For a symbol that is locally unbound, just the symbol appears in the value.
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
989 Note that storing new VALUEs in these elements doesn't change the variables.
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39974
diff changeset
990 No argument or nil as argument means use current buffer as BUFFER. */)
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39974
diff changeset
991 (buffer)
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
992 register Lisp_Object buffer;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
993 {
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
994 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
995 register Lisp_Object result;
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
996
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 392
diff changeset
997 if (NILP (buffer))
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
998 buf = current_buffer;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
999 else
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1000 {
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40605
diff changeset
1001 CHECK_BUFFER (buffer);
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1002 buf = XBUFFER (buffer);
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1003 }
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1004
60683
d2f6fa8790f3 (buffer_lisp_local_variables): New function,
Richard M. Stallman <rms@gnu.org>
parents: 60248
diff changeset
1005 result = buffer_lisp_local_variables (buf);
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1006
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1007 /* Add on all the variables stored in special slots. */
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1008 {
28314
c46e609d887a (buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents: 28207
diff changeset
1009 int offset, idx;
c46e609d887a (buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents: 28207
diff changeset
1010
28352
1555145f8c35 (buffer_permanent_local_flags): Use MAX_PER_BUFFER_VARS
Gerd Moellmann <gerd@gnu.org>
parents: 28332
diff changeset
1011 for (offset = PER_BUFFER_VAR_OFFSET (name);
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1012 offset < sizeof (struct buffer);
28314
c46e609d887a (buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents: 28207
diff changeset
1013 /* sizeof EMACS_INT == sizeof Lisp_Object */
c46e609d887a (buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents: 28207
diff changeset
1014 offset += (sizeof (EMACS_INT)))
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1015 {
28352
1555145f8c35 (buffer_permanent_local_flags): Use MAX_PER_BUFFER_VARS
Gerd Moellmann <gerd@gnu.org>
parents: 28332
diff changeset
1016 idx = PER_BUFFER_IDX (offset);
1555145f8c35 (buffer_permanent_local_flags): Use MAX_PER_BUFFER_VARS
Gerd Moellmann <gerd@gnu.org>
parents: 28332
diff changeset
1017 if ((idx == -1 || PER_BUFFER_VALUE_P (buf, idx))
1555145f8c35 (buffer_permanent_local_flags): Use MAX_PER_BUFFER_VARS
Gerd Moellmann <gerd@gnu.org>
parents: 28332
diff changeset
1018 && SYMBOLP (PER_BUFFER_SYMBOL (offset)))
1555145f8c35 (buffer_permanent_local_flags): Use MAX_PER_BUFFER_VARS
Gerd Moellmann <gerd@gnu.org>
parents: 28332
diff changeset
1019 result = Fcons (Fcons (PER_BUFFER_SYMBOL (offset),
1555145f8c35 (buffer_permanent_local_flags): Use MAX_PER_BUFFER_VARS
Gerd Moellmann <gerd@gnu.org>
parents: 28332
diff changeset
1020 PER_BUFFER_VALUE (buf, offset)),
28314
c46e609d887a (buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents: 28207
diff changeset
1021 result);
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1022 }
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1023 }
4100
f8c6e5e9603f (Fbuffer_local_variables): For local var that is unbound,
Richard M. Stallman <rms@gnu.org>
parents: 4077
diff changeset
1024
f8c6e5e9603f (Fbuffer_local_variables): For local var that is unbound,
Richard M. Stallman <rms@gnu.org>
parents: 4077
diff changeset
1025 return result;
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1026 }
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1027
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1028 DEFUN ("buffer-modified-p", Fbuffer_modified_p, Sbuffer_modified_p,
40108
6084dfa5f85d Reindent DEFUNs and DEFVARs woth doc: keywords.
Pavel Janík <Pavel@Janik.cz>
parents: 39988
diff changeset
1029 0, 1, 0,
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39974
diff changeset
1030 doc: /* Return t if BUFFER was modified since its file was last read or saved.
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39974
diff changeset
1031 No argument or nil as argument means use current buffer as BUFFER. */)
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39974
diff changeset
1032 (buffer)
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1033 register Lisp_Object buffer;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1034 {
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1035 register struct buffer *buf;
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 392
diff changeset
1036 if (NILP (buffer))
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1037 buf = current_buffer;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1038 else
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1039 {
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40605
diff changeset
1040 CHECK_BUFFER (buffer);
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1041 buf = XBUFFER (buffer);
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1042 }
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1043
10314
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1044 return BUF_SAVE_MODIFF (buf) < BUF_MODIFF (buf) ? Qt : Qnil;
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1045 }
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1046
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1047 DEFUN ("set-buffer-modified-p", Fset_buffer_modified_p, Sset_buffer_modified_p,
40108
6084dfa5f85d Reindent DEFUNs and DEFVARs woth doc: keywords.
Pavel Janík <Pavel@Janik.cz>
parents: 39988
diff changeset
1048 1, 1, 0,
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39974
diff changeset
1049 doc: /* Mark current buffer as modified or unmodified according to FLAG.
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39974
diff changeset
1050 A non-nil FLAG means mark the buffer modified. */)
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39974
diff changeset
1051 (flag)
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1052 register Lisp_Object flag;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1053 {
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1054 register int already;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1055 register Lisp_Object fn;
28207
fd3ece8a61e5 (Fset_buffer_modified_p): Set update_mode_lines
Gerd Moellmann <gerd@gnu.org>
parents: 27739
diff changeset
1056 Lisp_Object buffer, window;
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1057
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1058 #ifdef CLASH_DETECTION
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1059 /* If buffer becoming modified, lock the file.
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1060 If buffer becoming unmodified, unlock the file. */
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1061
11659
f9b6e65774e7 (Fset_buffer_modified_p): Use the truename for locking.
Richard M. Stallman <rms@gnu.org>
parents: 11473
diff changeset
1062 fn = current_buffer->file_truename;
24520
e8b7cb3fac8c (Fset_buffer_modified_p): Don't lock or unlock
Karl Heuer <kwzh@gnu.org>
parents: 24434
diff changeset
1063 /* Test buffer-file-name so that binding it to nil is effective. */
e8b7cb3fac8c (Fset_buffer_modified_p): Don't lock or unlock
Karl Heuer <kwzh@gnu.org>
parents: 24434
diff changeset
1064 if (!NILP (fn) && ! NILP (current_buffer->filename))
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1065 {
10314
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1066 already = SAVE_MODIFF < MODIFF;
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 392
diff changeset
1067 if (!already && !NILP (flag))
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1068 lock_file (fn);
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 392
diff changeset
1069 else if (already && NILP (flag))
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1070 unlock_file (fn);
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1071 }
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1072 #endif /* CLASH_DETECTION */
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1073
10314
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1074 SAVE_MODIFF = NILP (flag) ? MODIFF : 0;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49444
diff changeset
1075
28207
fd3ece8a61e5 (Fset_buffer_modified_p): Set update_mode_lines
Gerd Moellmann <gerd@gnu.org>
parents: 27739
diff changeset
1076 /* Set update_mode_lines only if buffer is displayed in some window.
fd3ece8a61e5 (Fset_buffer_modified_p): Set update_mode_lines
Gerd Moellmann <gerd@gnu.org>
parents: 27739
diff changeset
1077 Packages like jit-lock or lazy-lock preserve a buffer's modified
fd3ece8a61e5 (Fset_buffer_modified_p): Set update_mode_lines
Gerd Moellmann <gerd@gnu.org>
parents: 27739
diff changeset
1078 state by recording/restoring the state around blocks of code.
fd3ece8a61e5 (Fset_buffer_modified_p): Set update_mode_lines
Gerd Moellmann <gerd@gnu.org>
parents: 27739
diff changeset
1079 Setting update_mode_lines makes redisplay consider all windows
fd3ece8a61e5 (Fset_buffer_modified_p): Set update_mode_lines
Gerd Moellmann <gerd@gnu.org>
parents: 27739
diff changeset
1080 (on all frames). Stealth fontification of buffers not displayed
fd3ece8a61e5 (Fset_buffer_modified_p): Set update_mode_lines
Gerd Moellmann <gerd@gnu.org>
parents: 27739
diff changeset
1081 would incur additional redisplay costs if we'd set
fd3ece8a61e5 (Fset_buffer_modified_p): Set update_mode_lines
Gerd Moellmann <gerd@gnu.org>
parents: 27739
diff changeset
1082 update_modes_lines unconditionally.
fd3ece8a61e5 (Fset_buffer_modified_p): Set update_mode_lines
Gerd Moellmann <gerd@gnu.org>
parents: 27739
diff changeset
1083
fd3ece8a61e5 (Fset_buffer_modified_p): Set update_mode_lines
Gerd Moellmann <gerd@gnu.org>
parents: 27739
diff changeset
1084 Ideally, I think there should be another mechanism for fontifying
fd3ece8a61e5 (Fset_buffer_modified_p): Set update_mode_lines
Gerd Moellmann <gerd@gnu.org>
parents: 27739
diff changeset
1085 buffers without "modifying" buffers, or redisplay should be
fd3ece8a61e5 (Fset_buffer_modified_p): Set update_mode_lines
Gerd Moellmann <gerd@gnu.org>
parents: 27739
diff changeset
1086 smarter about updating the `*' in mode lines. --gerd */
fd3ece8a61e5 (Fset_buffer_modified_p): Set update_mode_lines
Gerd Moellmann <gerd@gnu.org>
parents: 27739
diff changeset
1087 XSETBUFFER (buffer, current_buffer);
fd3ece8a61e5 (Fset_buffer_modified_p): Set update_mode_lines
Gerd Moellmann <gerd@gnu.org>
parents: 27739
diff changeset
1088 window = Fget_buffer_window (buffer, Qt);
fd3ece8a61e5 (Fset_buffer_modified_p): Set update_mode_lines
Gerd Moellmann <gerd@gnu.org>
parents: 27739
diff changeset
1089 if (WINDOWP (window))
35339
e5e6579e8308 (Fset_buffer_modified_p): Set buffer's
Gerd Moellmann <gerd@gnu.org>
parents: 34488
diff changeset
1090 {
e5e6579e8308 (Fset_buffer_modified_p): Set buffer's
Gerd Moellmann <gerd@gnu.org>
parents: 34488
diff changeset
1091 ++update_mode_lines;
e5e6579e8308 (Fset_buffer_modified_p): Set buffer's
Gerd Moellmann <gerd@gnu.org>
parents: 34488
diff changeset
1092 current_buffer->prevent_redisplay_optimizations_p = 1;
e5e6579e8308 (Fset_buffer_modified_p): Set buffer's
Gerd Moellmann <gerd@gnu.org>
parents: 34488
diff changeset
1093 }
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49444
diff changeset
1094
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1095 return flag;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1096 }
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1097
28518
5da961b04d97 (Frestore_buffer_modified_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28417
diff changeset
1098 DEFUN ("restore-buffer-modified-p", Frestore_buffer_modified_p,
5da961b04d97 (Frestore_buffer_modified_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28417
diff changeset
1099 Srestore_buffer_modified_p, 1, 1, 0,
56669
126be634e20a (Frestore_buffer_modified_p): Doc fix.
John Paul Wallington <jpw@pobox.com>
parents: 56452
diff changeset
1100 doc: /* Like `set-buffer-modified-p', with a difference concerning redisplay.
39971
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
1101 It is not ensured that mode lines will be updated to show the modified
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39974
diff changeset
1102 state of the current buffer. Use with care. */)
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39974
diff changeset
1103 (flag)
28518
5da961b04d97 (Frestore_buffer_modified_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28417
diff changeset
1104 Lisp_Object flag;
5da961b04d97 (Frestore_buffer_modified_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28417
diff changeset
1105 {
5da961b04d97 (Frestore_buffer_modified_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28417
diff changeset
1106 #ifdef CLASH_DETECTION
5da961b04d97 (Frestore_buffer_modified_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28417
diff changeset
1107 Lisp_Object fn;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49444
diff changeset
1108
28518
5da961b04d97 (Frestore_buffer_modified_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28417
diff changeset
1109 /* If buffer becoming modified, lock the file.
5da961b04d97 (Frestore_buffer_modified_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28417
diff changeset
1110 If buffer becoming unmodified, unlock the file. */
5da961b04d97 (Frestore_buffer_modified_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28417
diff changeset
1111
5da961b04d97 (Frestore_buffer_modified_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28417
diff changeset
1112 fn = current_buffer->file_truename;
5da961b04d97 (Frestore_buffer_modified_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28417
diff changeset
1113 /* Test buffer-file-name so that binding it to nil is effective. */
5da961b04d97 (Frestore_buffer_modified_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28417
diff changeset
1114 if (!NILP (fn) && ! NILP (current_buffer->filename))
5da961b04d97 (Frestore_buffer_modified_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28417
diff changeset
1115 {
5da961b04d97 (Frestore_buffer_modified_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28417
diff changeset
1116 int already = SAVE_MODIFF < MODIFF;
5da961b04d97 (Frestore_buffer_modified_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28417
diff changeset
1117 if (!already && !NILP (flag))
5da961b04d97 (Frestore_buffer_modified_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28417
diff changeset
1118 lock_file (fn);
5da961b04d97 (Frestore_buffer_modified_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28417
diff changeset
1119 else if (already && NILP (flag))
5da961b04d97 (Frestore_buffer_modified_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28417
diff changeset
1120 unlock_file (fn);
5da961b04d97 (Frestore_buffer_modified_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28417
diff changeset
1121 }
5da961b04d97 (Frestore_buffer_modified_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28417
diff changeset
1122 #endif /* CLASH_DETECTION */
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49444
diff changeset
1123
28518
5da961b04d97 (Frestore_buffer_modified_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28417
diff changeset
1124 SAVE_MODIFF = NILP (flag) ? MODIFF : 0;
5da961b04d97 (Frestore_buffer_modified_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28417
diff changeset
1125 return flag;
5da961b04d97 (Frestore_buffer_modified_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28417
diff changeset
1126 }
5da961b04d97 (Frestore_buffer_modified_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28417
diff changeset
1127
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1128 DEFUN ("buffer-modified-tick", Fbuffer_modified_tick, Sbuffer_modified_tick,
40108
6084dfa5f85d Reindent DEFUNs and DEFVARs woth doc: keywords.
Pavel Janík <Pavel@Janik.cz>
parents: 39988
diff changeset
1129 0, 1, 0,
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39974
diff changeset
1130 doc: /* Return BUFFER's tick counter, incremented for each change in text.
39971
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
1131 Each buffer has a tick counter which is incremented each time the text in
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
1132 that buffer is changed. It wraps around occasionally.
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39974
diff changeset
1133 No argument or nil as argument means use current buffer as BUFFER. */)
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39974
diff changeset
1134 (buffer)
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1135 register Lisp_Object buffer;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1136 {
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1137 register struct buffer *buf;
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 392
diff changeset
1138 if (NILP (buffer))
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1139 buf = current_buffer;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1140 else
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1141 {
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40605
diff changeset
1142 CHECK_BUFFER (buffer);
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1143 buf = XBUFFER (buffer);
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1144 }
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1145
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1146 return make_number (BUF_MODIFF (buf));
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1147 }
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1148
392
dce611246f59 *** empty log message ***
Roland McGrath <roland@gnu.org>
parents: 333
diff changeset
1149 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
1150 "sRename buffer (to new name): \nP",
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39974
diff changeset
1151 doc: /* Change current buffer's name to NEWNAME (a string).
39971
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
1152 If second arg UNIQUE is nil or omitted, it is an error if a
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
1153 buffer named NEWNAME already exists.
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
1154 If UNIQUE is non-nil, come up with a new name using
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
1155 `generate-new-buffer-name'.
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
1156 Interactively, you can set UNIQUE with a prefix argument.
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
1157 We return the name we actually gave the buffer.
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39974
diff changeset
1158 This does not change the name of the visited file (if any). */)
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39974
diff changeset
1159 (newname, unique)
9933
d3f22955b872 (Frename_buffer): Rename arg NAME to NEWNAME.
Richard M. Stallman <rms@gnu.org>
parents: 9922
diff changeset
1160 register Lisp_Object newname, unique;
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1161 {
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1162 register Lisp_Object tem, buf;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1163
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40605
diff changeset
1164 CHECK_STRING (newname);
9933
d3f22955b872 (Frename_buffer): Rename arg NAME to NEWNAME.
Richard M. Stallman <rms@gnu.org>
parents: 9922
diff changeset
1165
46370
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46293
diff changeset
1166 if (SCHARS (newname) == 0)
7455
35657813817c (Frename_buffer): Reject empty string as new name.
Richard M. Stallman <rms@gnu.org>
parents: 7434
diff changeset
1167 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
1168
9933
d3f22955b872 (Frename_buffer): Rename arg NAME to NEWNAME.
Richard M. Stallman <rms@gnu.org>
parents: 9922
diff changeset
1169 tem = Fget_buffer (newname);
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 392
diff changeset
1170 if (!NILP (tem))
392
dce611246f59 *** empty log message ***
Roland McGrath <roland@gnu.org>
parents: 333
diff changeset
1171 {
28417
4b675266db04 * lisp.h (XCONS, XSTRING, XSYMBOL, XFLOAT, XPROCESS, XWINDOW, XSUBR, XBUFFER):
Ken Raeburn <raeburn@raeburn.org>
parents: 28352
diff changeset
1172 /* Don't short-circuit if UNIQUE is t. That is a useful way to
4b675266db04 * lisp.h (XCONS, XSTRING, XSYMBOL, XFLOAT, XPROCESS, XWINDOW, XSUBR, XBUFFER):
Ken Raeburn <raeburn@raeburn.org>
parents: 28352
diff changeset
1173 rename the buffer automatically so you can create another
4b675266db04 * lisp.h (XCONS, XSTRING, XSYMBOL, XFLOAT, XPROCESS, XWINDOW, XSUBR, XBUFFER):
Ken Raeburn <raeburn@raeburn.org>
parents: 28352
diff changeset
1174 with the original name. It makes UNIQUE equivalent to
4b675266db04 * lisp.h (XCONS, XSTRING, XSYMBOL, XFLOAT, XPROCESS, XWINDOW, XSUBR, XBUFFER):
Ken Raeburn <raeburn@raeburn.org>
parents: 28352
diff changeset
1175 (rename-buffer (generate-new-buffer-name NEWNAME)). */
4b675266db04 * lisp.h (XCONS, XSTRING, XSYMBOL, XFLOAT, XPROCESS, XWINDOW, XSUBR, XBUFFER):
Ken Raeburn <raeburn@raeburn.org>
parents: 28352
diff changeset
1176 if (NILP (unique) && XBUFFER (tem) == current_buffer)
4b675266db04 * lisp.h (XCONS, XSTRING, XSYMBOL, XFLOAT, XPROCESS, XWINDOW, XSUBR, XBUFFER):
Ken Raeburn <raeburn@raeburn.org>
parents: 28352
diff changeset
1177 return current_buffer->name;
1876
0ddafa88e654 (Frename_buffer): Make prefix arg set UNIQUE.
Richard M. Stallman <rms@gnu.org>
parents: 1821
diff changeset
1178 if (!NILP (unique))
9933
d3f22955b872 (Frename_buffer): Rename arg NAME to NEWNAME.
Richard M. Stallman <rms@gnu.org>
parents: 9922
diff changeset
1179 newname = Fgenerate_new_buffer_name (newname, current_buffer->name);
392
dce611246f59 *** empty log message ***
Roland McGrath <roland@gnu.org>
parents: 333
diff changeset
1180 else
46370
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46293
diff changeset
1181 error ("Buffer name `%s' is in use", SDATA (newname));
392
dce611246f59 *** empty log message ***
Roland McGrath <roland@gnu.org>
parents: 333
diff changeset
1182 }
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1183
9933
d3f22955b872 (Frename_buffer): Rename arg NAME to NEWNAME.
Richard M. Stallman <rms@gnu.org>
parents: 9922
diff changeset
1184 current_buffer->name = newname;
1707
86c951f6a444 * buffer.c (Frename_buffer): Set update_mode_lines.
Jim Blandy <jimb@redhat.com>
parents: 1586
diff changeset
1185
86c951f6a444 * buffer.c (Frename_buffer): Set update_mode_lines.
Jim Blandy <jimb@redhat.com>
parents: 1586
diff changeset
1186 /* 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
1187 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
1188 update_mode_lines++;
86c951f6a444 * buffer.c (Frename_buffer): Set update_mode_lines.
Jim Blandy <jimb@redhat.com>
parents: 1586
diff changeset
1189
9262
582534b6e763 (Fget_buffer_create, Frename_buffer, Fbuffer_disable_undo,
Karl Heuer <kwzh@gnu.org>
parents: 9211
diff changeset
1190 XSETBUFFER (buf, current_buffer);
9933
d3f22955b872 (Frename_buffer): Rename arg NAME to NEWNAME.
Richard M. Stallman <rms@gnu.org>
parents: 9922
diff changeset
1191 Fsetcar (Frassq (buf, Vbuffer_alist), newname);
8599
cf3233d70e94 (Frename_buffer): Fix gcpro problems.
Karl Heuer <kwzh@gnu.org>
parents: 8550
diff changeset
1192 if (NILP (current_buffer->filename)
cf3233d70e94 (Frename_buffer): Fix gcpro problems.
Karl Heuer <kwzh@gnu.org>
parents: 8550
diff changeset
1193 && !NILP (current_buffer->auto_save_file_name))
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1194 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
1195 /* 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
1196 return current_buffer->name;
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1197 }
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1198
22189
2a61a0a3a9be (Fother_buffer): New arg FRAME. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents: 22171
diff changeset
1199 DEFUN ("other-buffer", Fother_buffer, Sother_buffer, 0, 3, 0,
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39974
diff changeset
1200 doc: /* Return most recently selected buffer other than BUFFER.
39971
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
1201 Buffers not visible in windows are preferred to visible buffers,
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
1202 unless optional second argument VISIBLE-OK is non-nil.
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
1203 If the optional third argument FRAME is non-nil, use that frame's
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
1204 buffer list instead of the selected frame's buffer list.
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
1205 If no other buffer exists, the buffer `*scratch*' is returned.
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39974
diff changeset
1206 If BUFFER is omitted or nil, some interesting buffer is returned. */)
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39974
diff changeset
1207 (buffer, visible_ok, frame)
22189
2a61a0a3a9be (Fother_buffer): New arg FRAME. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents: 22171
diff changeset
1208 register Lisp_Object buffer, visible_ok, frame;
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1209 {
14226
ad275aca6fc5 (Fother_buffer): If we have to create a new buffer, use
Karl Heuer <kwzh@gnu.org>
parents: 14186
diff changeset
1210 Lisp_Object Fset_buffer_major_mode ();
17218
a57ca25e9c62 (reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents: 17124
diff changeset
1211 register Lisp_Object tail, buf, notsogood, tem, pred, add_ons;
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1212 notsogood = Qnil;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1213
22189
2a61a0a3a9be (Fother_buffer): New arg FRAME. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents: 22171
diff changeset
1214 if (NILP (frame))
25664
832aeb9c3996 (Fother_buffer): Change for Lisp_Object selected_frame.
Gerd Moellmann <gerd@gnu.org>
parents: 25653
diff changeset
1215 frame = selected_frame;
22189
2a61a0a3a9be (Fother_buffer): New arg FRAME. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents: 22171
diff changeset
1216
17218
a57ca25e9c62 (reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents: 17124
diff changeset
1217 tail = Vbuffer_alist;
22189
2a61a0a3a9be (Fother_buffer): New arg FRAME. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents: 22171
diff changeset
1218 pred = frame_buffer_predicate (frame);
17218
a57ca25e9c62 (reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents: 17124
diff changeset
1219
a57ca25e9c62 (reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents: 17124
diff changeset
1220 /* 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
1221 before other buffers. */
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49444
diff changeset
1222
22189
2a61a0a3a9be (Fother_buffer): New arg FRAME. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents: 22171
diff changeset
1223 tem = frame_buffer_list (frame);
17218
a57ca25e9c62 (reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents: 17124
diff changeset
1224 add_ons = Qnil;
a57ca25e9c62 (reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents: 17124
diff changeset
1225 while (CONSP (tem))
a57ca25e9c62 (reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents: 17124
diff changeset
1226 {
26164
d39ec0a27081 more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents: 26088
diff changeset
1227 if (BUFFERP (XCAR (tem)))
d39ec0a27081 more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents: 26088
diff changeset
1228 add_ons = Fcons (Fcons (Qnil, XCAR (tem)), add_ons);
d39ec0a27081 more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents: 26088
diff changeset
1229 tem = XCDR (tem);
17218
a57ca25e9c62 (reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents: 17124
diff changeset
1230 }
a57ca25e9c62 (reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents: 17124
diff changeset
1231 tail = nconc2 (Fnreverse (add_ons), tail);
a57ca25e9c62 (reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents: 17124
diff changeset
1232
47972
287494c5e770 (assoc_ignore_text_properties, Fother_buffer, Fkill_buffer)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 46920
diff changeset
1233 for (; CONSP (tail); tail = XCDR (tail))
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1234 {
47972
287494c5e770 (assoc_ignore_text_properties, Fother_buffer, Fkill_buffer)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 46920
diff changeset
1235 buf = Fcdr (XCAR (tail));
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1236 if (EQ (buf, buffer))
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1237 continue;
53350
89a24e997838 (Fother_buffer): Don't crash if BUF is nil
Richard M. Stallman <rms@gnu.org>
parents: 52459
diff changeset
1238 if (NILP (buf))
89a24e997838 (Fother_buffer): Don't crash if BUF is nil
Richard M. Stallman <rms@gnu.org>
parents: 52459
diff changeset
1239 continue;
89a24e997838 (Fother_buffer): Don't crash if BUF is nil
Richard M. Stallman <rms@gnu.org>
parents: 52459
diff changeset
1240 if (NILP (XBUFFER (buf)->name))
89a24e997838 (Fother_buffer): Don't crash if BUF is nil
Richard M. Stallman <rms@gnu.org>
parents: 52459
diff changeset
1241 continue;
46419
46ff766afaaf * buffer.c (Fother_buffer): Use SREF when retrieving a byte from
Ken Raeburn <raeburn@raeburn.org>
parents: 46378
diff changeset
1242 if (SREF (XBUFFER (buf)->name, 0) == ' ')
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1243 continue;
10210
43e95429ffa0 (Fget_buffer_create): Copy the name, and clear text props.
Richard M. Stallman <rms@gnu.org>
parents: 10146
diff changeset
1244 /* 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
1245 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
1246 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
1247 {
17218
a57ca25e9c62 (reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents: 17124
diff changeset
1248 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
1249 if (NILP (tem))
43e95429ffa0 (Fget_buffer_create): Copy the name, and clear text props.
Richard M. Stallman <rms@gnu.org>
parents: 10146
diff changeset
1250 continue;
43e95429ffa0 (Fget_buffer_create): Copy the name, and clear text props.
Richard M. Stallman <rms@gnu.org>
parents: 10146
diff changeset
1251 }
43e95429ffa0 (Fget_buffer_create): Copy the name, and clear text props.
Richard M. Stallman <rms@gnu.org>
parents: 10146
diff changeset
1252
1281
1f6cfa3ea4cb * buffer.c (Fother_buffer): Add back the VISIBLE_OK argument. It
Jim Blandy <jimb@redhat.com>
parents: 1253
diff changeset
1253 if (NILP (visible_ok))
31395
d0f522cf422b (Fother_buffer): Consider buffers as invisible when
Gerd Moellmann <gerd@gnu.org>
parents: 31128
diff changeset
1254 tem = Fget_buffer_window (buf, Qvisible);
1281
1f6cfa3ea4cb * buffer.c (Fother_buffer): Add back the VISIBLE_OK argument. It
Jim Blandy <jimb@redhat.com>
parents: 1253
diff changeset
1255 else
1f6cfa3ea4cb * buffer.c (Fother_buffer): Add back the VISIBLE_OK argument. It
Jim Blandy <jimb@redhat.com>
parents: 1253
diff changeset
1256 tem = Qnil;
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 392
diff changeset
1257 if (NILP (tem))
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1258 return buf;
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 392
diff changeset
1259 if (NILP (notsogood))
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1260 notsogood = buf;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1261 }
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 392
diff changeset
1262 if (!NILP (notsogood))
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1263 return notsogood;
27480
90165d2202f9 (Fother_buffer): Don't call Fset_buffer_major_mode
Gerd Moellmann <gerd@gnu.org>
parents: 27012
diff changeset
1264 buf = Fget_buffer (build_string ("*scratch*"));
90165d2202f9 (Fother_buffer): Don't call Fset_buffer_major_mode
Gerd Moellmann <gerd@gnu.org>
parents: 27012
diff changeset
1265 if (NILP (buf))
90165d2202f9 (Fother_buffer): Don't call Fset_buffer_major_mode
Gerd Moellmann <gerd@gnu.org>
parents: 27012
diff changeset
1266 {
90165d2202f9 (Fother_buffer): Don't call Fset_buffer_major_mode
Gerd Moellmann <gerd@gnu.org>
parents: 27012
diff changeset
1267 buf = Fget_buffer_create (build_string ("*scratch*"));
90165d2202f9 (Fother_buffer): Don't call Fset_buffer_major_mode
Gerd Moellmann <gerd@gnu.org>
parents: 27012
diff changeset
1268 Fset_buffer_major_mode (buf);
90165d2202f9 (Fother_buffer): Don't call Fset_buffer_major_mode
Gerd Moellmann <gerd@gnu.org>
parents: 27012
diff changeset
1269 }
14226
ad275aca6fc5 (Fother_buffer): If we have to create a new buffer, use
Karl Heuer <kwzh@gnu.org>
parents: 14186
diff changeset
1270 return buf;
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1271 }
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1272
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1273 DEFUN ("buffer-enable-undo", Fbuffer_enable_undo, Sbuffer_enable_undo,
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1274 0, 1, "",
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39974
diff changeset
1275 doc: /* Start keeping undo information for buffer BUFFER.
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39974
diff changeset
1276 No argument or nil as argument means do this for the current buffer. */)
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39974
diff changeset
1277 (buffer)
648
70b112526394 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 585
diff changeset
1278 register Lisp_Object buffer;
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1279 {
648
70b112526394 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 585
diff changeset
1280 Lisp_Object real_buffer;
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1281
648
70b112526394 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 585
diff changeset
1282 if (NILP (buffer))
9262
582534b6e763 (Fget_buffer_create, Frename_buffer, Fbuffer_disable_undo,
Karl Heuer <kwzh@gnu.org>
parents: 9211
diff changeset
1283 XSETBUFFER (real_buffer, current_buffer);
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1284 else
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1285 {
648
70b112526394 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 585
diff changeset
1286 real_buffer = Fget_buffer (buffer);
70b112526394 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 585
diff changeset
1287 if (NILP (real_buffer))
70b112526394 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 585
diff changeset
1288 nsberror (buffer);
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1289 }
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1290
648
70b112526394 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 585
diff changeset
1291 if (EQ (XBUFFER (real_buffer)->undo_list, Qt))
70b112526394 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 585
diff changeset
1292 XBUFFER (real_buffer)->undo_list = Qnil;
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1293
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1294 return Qnil;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1295 }
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1296
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1297 /*
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1298 DEFVAR_LISP ("kill-buffer-hook", no_cell, "\
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1299 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
1300 The buffer being killed will be current while the hook is running.\n\
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1301 See `kill-buffer'."
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1302 */
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1303 DEFUN ("kill-buffer", Fkill_buffer, Skill_buffer, 1, 1, "bKill buffer: ",
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39974
diff changeset
1304 doc: /* Kill the buffer BUFFER.
39971
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
1305 The argument may be a buffer or may be the name of a buffer.
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
1306 An argument of nil means kill the current buffer.
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
1307
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
1308 Value is t if the buffer is actually killed, nil if user says no.
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
1309
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
1310 The value of `kill-buffer-hook' (which may be local to that buffer),
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
1311 if not void, is a list of functions to be called, with no arguments,
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
1312 before the buffer is actually killed. The buffer to be killed is current
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
1313 when the hook functions are called.
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
1314
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
1315 Any processes that have this buffer as the `process-buffer' are killed
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39974
diff changeset
1316 with SIGHUP. */)
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39974
diff changeset
1317 (buffer)
13762
71c14edf7d6d (Fkill_buffer): Rename arg bufname to buffer.
Karl Heuer <kwzh@gnu.org>
parents: 13446
diff changeset
1318 Lisp_Object buffer;
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1319 {
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1320 Lisp_Object buf;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1321 register struct buffer *b;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1322 register Lisp_Object tem;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1323 register struct Lisp_Marker *m;
25744
8b89b961f7d1 (Fkill_buffer): Remove unused variables.
Gerd Moellmann <gerd@gnu.org>
parents: 25664
diff changeset
1324 struct gcpro gcpro1;
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1325
13762
71c14edf7d6d (Fkill_buffer): Rename arg bufname to buffer.
Karl Heuer <kwzh@gnu.org>
parents: 13446
diff changeset
1326 if (NILP (buffer))
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1327 buf = Fcurrent_buffer ();
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1328 else
13762
71c14edf7d6d (Fkill_buffer): Rename arg bufname to buffer.
Karl Heuer <kwzh@gnu.org>
parents: 13446
diff changeset
1329 buf = Fget_buffer (buffer);
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 392
diff changeset
1330 if (NILP (buf))
13762
71c14edf7d6d (Fkill_buffer): Rename arg bufname to buffer.
Karl Heuer <kwzh@gnu.org>
parents: 13446
diff changeset
1331 nsberror (buffer);
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1332
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1333 b = XBUFFER (buf);
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1334
12076
ee38e93ccf7e (Fkill_buffer): When killing indirect buffer,
Karl Heuer <kwzh@gnu.org>
parents: 11889
diff changeset
1335 /* Avoid trouble for buffer already dead. */
ee38e93ccf7e (Fkill_buffer): When killing indirect buffer,
Karl Heuer <kwzh@gnu.org>
parents: 11889
diff changeset
1336 if (NILP (b->name))
ee38e93ccf7e (Fkill_buffer): When killing indirect buffer,
Karl Heuer <kwzh@gnu.org>
parents: 11889
diff changeset
1337 return Qnil;
ee38e93ccf7e (Fkill_buffer): When killing indirect buffer,
Karl Heuer <kwzh@gnu.org>
parents: 11889
diff changeset
1338
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1339 /* Query if the buffer is still modified. */
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 392
diff changeset
1340 if (INTERACTIVE && !NILP (b->filename)
10314
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1341 && BUF_MODIFF (b) > BUF_SAVE_MODIFF (b))
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1342 {
13762
71c14edf7d6d (Fkill_buffer): Rename arg bufname to buffer.
Karl Heuer <kwzh@gnu.org>
parents: 13446
diff changeset
1343 GCPRO1 (buf);
49444
a80513b20297 (Fkill_buffer): Call format2 instead of format1.
Richard M. Stallman <rms@gnu.org>
parents: 49057
diff changeset
1344 tem = do_yes_or_no_p (format2 ("Buffer %s modified; kill anyway? ",
a80513b20297 (Fkill_buffer): Call format2 instead of format1.
Richard M. Stallman <rms@gnu.org>
parents: 49057
diff changeset
1345 b->name, make_number (0)));
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1346 UNGCPRO;
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 392
diff changeset
1347 if (NILP (tem))
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1348 return Qnil;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1349 }
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1350
6051
0b144d967f30 (Fkill_buffer): Call the Vkill_buffer_query_functions.
Richard M. Stallman <rms@gnu.org>
parents: 5904
diff changeset
1351 /* Run hooks with the buffer to be killed the current buffer. */
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1352 {
46293
1fb8f75062c6 Use macro SPECPDL_INDEX.
Juanma Barranquero <lekktu@gmail.com>
parents: 46199
diff changeset
1353 int count = SPECPDL_INDEX ();
50014
3b2576528809 (Fkill_buffer): Use Frun_hook_with_args_until_failure
Richard M. Stallman <rms@gnu.org>
parents: 49974
diff changeset
1354 Lisp_Object arglist[1];
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1355
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1356 record_unwind_protect (save_excursion_restore, save_excursion_save ());
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1357 set_buffer_internal (b);
6051
0b144d967f30 (Fkill_buffer): Call the Vkill_buffer_query_functions.
Richard M. Stallman <rms@gnu.org>
parents: 5904
diff changeset
1358
0b144d967f30 (Fkill_buffer): Call the Vkill_buffer_query_functions.
Richard M. Stallman <rms@gnu.org>
parents: 5904
diff changeset
1359 /* 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
1360 don't kill the buffer. */
50014
3b2576528809 (Fkill_buffer): Use Frun_hook_with_args_until_failure
Richard M. Stallman <rms@gnu.org>
parents: 49974
diff changeset
1361 arglist[0] = Qkill_buffer_query_functions;
3b2576528809 (Fkill_buffer): Use Frun_hook_with_args_until_failure
Richard M. Stallman <rms@gnu.org>
parents: 49974
diff changeset
1362 if (NILP (Frun_hook_with_args_until_failure (1, arglist)))
3b2576528809 (Fkill_buffer): Use Frun_hook_with_args_until_failure
Richard M. Stallman <rms@gnu.org>
parents: 49974
diff changeset
1363 return unbind_to (count, Qnil);
6051
0b144d967f30 (Fkill_buffer): Call the Vkill_buffer_query_functions.
Richard M. Stallman <rms@gnu.org>
parents: 5904
diff changeset
1364
0b144d967f30 (Fkill_buffer): Call the Vkill_buffer_query_functions.
Richard M. Stallman <rms@gnu.org>
parents: 5904
diff changeset
1365 /* Then run the hooks. */
41524
095a45698793 (Fkill_buffer): Use Frun_hooks, not Vrun_hooks.
Richard M. Stallman <rms@gnu.org>
parents: 41027
diff changeset
1366 Frun_hooks (1, &Qkill_buffer_hook);
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1367 unbind_to (count, Qnil);
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1368 }
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1369
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1370 /* We have no more questions to ask. Verify that it is valid
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1371 to kill the buffer. This must be done after the questions
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1372 since anything can happen within do_yes_or_no_p. */
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1373
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1374 /* Don't kill the minibuffer now current. */
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1375 if (EQ (buf, XWINDOW (minibuf_window)->buffer))
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1376 return Qnil;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1377
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 392
diff changeset
1378 if (NILP (b->name))
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1379 return Qnil;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1380
10314
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1381 /* 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
1382 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
1383 ask questions or their hooks get errors. */
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1384 if (! b->base_buffer)
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 struct buffer *other;
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1387
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1388 GCPRO1 (buf);
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 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
1391 /* all_buffers contains dead buffers too;
ee38e93ccf7e (Fkill_buffer): When killing indirect buffer,
Karl Heuer <kwzh@gnu.org>
parents: 11889
diff changeset
1392 don't re-kill them. */
ee38e93ccf7e (Fkill_buffer): When killing indirect buffer,
Karl Heuer <kwzh@gnu.org>
parents: 11889
diff changeset
1393 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
1394 {
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1395 Lisp_Object buf;
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1396 XSETBUFFER (buf, other);
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1397 Fkill_buffer (buf);
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1398 }
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1399
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1400 UNGCPRO;
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1401 }
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49444
diff changeset
1402
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1403 /* Make this buffer not be current.
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1404 In the process, notice if this is the sole visible buffer
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1405 and give up if so. */
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1406 if (b == current_buffer)
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1407 {
22189
2a61a0a3a9be (Fother_buffer): New arg FRAME. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents: 22171
diff changeset
1408 tem = Fother_buffer (buf, Qnil, Qnil);
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1409 Fset_buffer (tem);
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1410 if (b == current_buffer)
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1411 return Qnil;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1412 }
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1413
33698
6864fead9622 (Fkill_buffer): Notice if the buffer to kill is the
Gerd Moellmann <gerd@gnu.org>
parents: 33675
diff changeset
1414 /* Notice if the buffer to kill is the sole visible buffer
6864fead9622 (Fkill_buffer): Notice if the buffer to kill is the
Gerd Moellmann <gerd@gnu.org>
parents: 33675
diff changeset
1415 when we're currently in the mini-buffer, and give up if so. */
6864fead9622 (Fkill_buffer): Notice if the buffer to kill is the
Gerd Moellmann <gerd@gnu.org>
parents: 33675
diff changeset
1416 XSETBUFFER (tem, current_buffer);
6864fead9622 (Fkill_buffer): Notice if the buffer to kill is the
Gerd Moellmann <gerd@gnu.org>
parents: 33675
diff changeset
1417 if (EQ (tem, XWINDOW (minibuf_window)->buffer))
6864fead9622 (Fkill_buffer): Notice if the buffer to kill is the
Gerd Moellmann <gerd@gnu.org>
parents: 33675
diff changeset
1418 {
6864fead9622 (Fkill_buffer): Notice if the buffer to kill is the
Gerd Moellmann <gerd@gnu.org>
parents: 33675
diff changeset
1419 tem = Fother_buffer (buf, Qnil, Qnil);
6864fead9622 (Fkill_buffer): Notice if the buffer to kill is the
Gerd Moellmann <gerd@gnu.org>
parents: 33675
diff changeset
1420 if (EQ (buf, tem))
6864fead9622 (Fkill_buffer): Notice if the buffer to kill is the
Gerd Moellmann <gerd@gnu.org>
parents: 33675
diff changeset
1421 return Qnil;
6864fead9622 (Fkill_buffer): Notice if the buffer to kill is the
Gerd Moellmann <gerd@gnu.org>
parents: 33675
diff changeset
1422 }
6864fead9622 (Fkill_buffer): Notice if the buffer to kill is the
Gerd Moellmann <gerd@gnu.org>
parents: 33675
diff changeset
1423
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1424 /* Now there is no question: we can kill the buffer. */
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1425
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1426 #ifdef CLASH_DETECTION
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1427 /* Unlock this buffer's file, if it is locked. */
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1428 unlock_buffer (b);
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1429 #endif /* CLASH_DETECTION */
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1430
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1431 kill_buffer_processes (buf);
51782
3b58843e8f3f (Fkill_buffer): Clear charpos cache if necessary.
Kenichi Handa <handa@m17n.org>
parents: 51669
diff changeset
1432 clear_charpos_cache (b);
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1433
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1434 tem = Vinhibit_quit;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1435 Vinhibit_quit = Qt;
13922
5636ed4243ec (Fkill_buffer): Delete buffer from Vbuffer_alist after replacing it.
Erik Naggum <erik@naggum.no>
parents: 13917
diff changeset
1436 replace_buffer_in_all_windows (buf);
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1437 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
1438 frames_discard_buffer (buf);
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1439 Vinhibit_quit = tem;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1440
40760
aa9b081b3a0d (Fkill_buffer): Don't delete auto save file if buffer is modified.
Richard M. Stallman <rms@gnu.org>
parents: 40735
diff changeset
1441 /* Delete any auto-save file, if we saved it in this session.
aa9b081b3a0d (Fkill_buffer): Don't delete auto save file if buffer is modified.
Richard M. Stallman <rms@gnu.org>
parents: 40735
diff changeset
1442 But not if the buffer is modified. */
9146
8f966cc4652b (nsberror, Fget_buffer, Fget_file_buffer, Fbuffer_local_variables,
Karl Heuer <kwzh@gnu.org>
parents: 9047
diff changeset
1443 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
1444 && b->auto_save_modified != 0
40760
aa9b081b3a0d (Fkill_buffer): Don't delete auto save file if buffer is modified.
Richard M. Stallman <rms@gnu.org>
parents: 40735
diff changeset
1445 && BUF_SAVE_MODIFF (b) < b->auto_save_modified
53350
89a24e997838 (Fother_buffer): Don't crash if BUF is nil
Richard M. Stallman <rms@gnu.org>
parents: 52459
diff changeset
1446 && BUF_SAVE_MODIFF (b) < BUF_MODIFF (b)
89a24e997838 (Fother_buffer): Don't crash if BUF is nil
Richard M. Stallman <rms@gnu.org>
parents: 52459
diff changeset
1447 && NILP (Fsymbol_value (intern ("auto-save-visited-file-name"))))
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1448 {
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1449 Lisp_Object tem;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1450 tem = Fsymbol_value (intern ("delete-auto-save-files"));
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 392
diff changeset
1451 if (! NILP (tem))
10082
8d3a71736423 (Fkill_buffer): Use internal_delete_file.
Richard M. Stallman <rms@gnu.org>
parents: 9950
diff changeset
1452 internal_delete_file (b->auto_save_file_name);
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1453 }
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1454
12076
ee38e93ccf7e (Fkill_buffer): When killing indirect buffer,
Karl Heuer <kwzh@gnu.org>
parents: 11889
diff changeset
1455 if (b->base_buffer)
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1456 {
12076
ee38e93ccf7e (Fkill_buffer): When killing indirect buffer,
Karl Heuer <kwzh@gnu.org>
parents: 11889
diff changeset
1457 /* 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
1458 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
1459 or its other indirect buffers. */
51669
f3dc77591fe2 (set_buffer_internal_1): Test CONSP for lists.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51431
diff changeset
1460 for (m = BUF_MARKERS (b); m; )
12076
ee38e93ccf7e (Fkill_buffer): When killing indirect buffer,
Karl Heuer <kwzh@gnu.org>
parents: 11889
diff changeset
1461 {
51669
f3dc77591fe2 (set_buffer_internal_1): Test CONSP for lists.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51431
diff changeset
1462 struct Lisp_Marker *next = m->next;
12076
ee38e93ccf7e (Fkill_buffer): When killing indirect buffer,
Karl Heuer <kwzh@gnu.org>
parents: 11889
diff changeset
1463 if (m->buffer == b)
51669
f3dc77591fe2 (set_buffer_internal_1): Test CONSP for lists.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51431
diff changeset
1464 unchain_marker (m);
f3dc77591fe2 (set_buffer_internal_1): Test CONSP for lists.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51431
diff changeset
1465 m = next;
12076
ee38e93ccf7e (Fkill_buffer): When killing indirect buffer,
Karl Heuer <kwzh@gnu.org>
parents: 11889
diff changeset
1466 }
ee38e93ccf7e (Fkill_buffer): When killing indirect buffer,
Karl Heuer <kwzh@gnu.org>
parents: 11889
diff changeset
1467 }
ee38e93ccf7e (Fkill_buffer): When killing indirect buffer,
Karl Heuer <kwzh@gnu.org>
parents: 11889
diff changeset
1468 else
ee38e93ccf7e (Fkill_buffer): When killing indirect buffer,
Karl Heuer <kwzh@gnu.org>
parents: 11889
diff changeset
1469 {
ee38e93ccf7e (Fkill_buffer): When killing indirect buffer,
Karl Heuer <kwzh@gnu.org>
parents: 11889
diff changeset
1470 /* 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
1471 and leave them pointing nowhere. */
51669
f3dc77591fe2 (set_buffer_internal_1): Test CONSP for lists.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51431
diff changeset
1472 for (m = BUF_MARKERS (b); m; )
10314
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1473 {
51669
f3dc77591fe2 (set_buffer_internal_1): Test CONSP for lists.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51431
diff changeset
1474 struct Lisp_Marker *next = m->next;
10314
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1475 m->buffer = 0;
51669
f3dc77591fe2 (set_buffer_internal_1): Test CONSP for lists.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51431
diff changeset
1476 m->next = NULL;
f3dc77591fe2 (set_buffer_internal_1): Test CONSP for lists.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51431
diff changeset
1477 m = next;
10314
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1478 }
51669
f3dc77591fe2 (set_buffer_internal_1): Test CONSP for lists.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51431
diff changeset
1479 BUF_MARKERS (b) = NULL;
10314
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1480 BUF_INTERVALS (b) = NULL_INTERVAL;
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 /* Perhaps we should explicitly free the interval tree here... */
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1483 }
1291
7c32612174c3 * buffer.c (reset_buffer): Do INITIALIZE_INTERVAL on the buffer's
Joseph Arceneaux <jla@gnu.org>
parents: 1281
diff changeset
1484
11214
b880572ce431 (Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents: 11112
diff changeset
1485 /* 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
1486 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
1487 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
1488 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
1489 swap_out_buffer_local_variables (b);
15776
6018e01d4466 (buffer_permanent_local_flags): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 15638
diff changeset
1490 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
1491
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1492 b->name = Qnil;
10314
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1493
2439
b6c62e4abf59 Put interrupt input blocking in a separate file from xterm.h.
Jim Blandy <jimb@redhat.com>
parents: 2389
diff changeset
1494 BLOCK_INPUT;
10314
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1495 if (! b->base_buffer)
31604
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
1496 free_buffer_text (b);
10314
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1497
9403
9f797989b817 * buffer.c: #include region-cache.h.
Jim Blandy <jimb@redhat.com>
parents: 9362
diff changeset
1498 if (b->newline_cache)
9f797989b817 * buffer.c: #include region-cache.h.
Jim Blandy <jimb@redhat.com>
parents: 9362
diff changeset
1499 {
9f797989b817 * buffer.c: #include region-cache.h.
Jim Blandy <jimb@redhat.com>
parents: 9362
diff changeset
1500 free_region_cache (b->newline_cache);
9f797989b817 * buffer.c: #include region-cache.h.
Jim Blandy <jimb@redhat.com>
parents: 9362
diff changeset
1501 b->newline_cache = 0;
9f797989b817 * buffer.c: #include region-cache.h.
Jim Blandy <jimb@redhat.com>
parents: 9362
diff changeset
1502 }
9f797989b817 * buffer.c: #include region-cache.h.
Jim Blandy <jimb@redhat.com>
parents: 9362
diff changeset
1503 if (b->width_run_cache)
9f797989b817 * buffer.c: #include region-cache.h.
Jim Blandy <jimb@redhat.com>
parents: 9362
diff changeset
1504 {
9f797989b817 * buffer.c: #include region-cache.h.
Jim Blandy <jimb@redhat.com>
parents: 9362
diff changeset
1505 free_region_cache (b->width_run_cache);
9f797989b817 * buffer.c: #include region-cache.h.
Jim Blandy <jimb@redhat.com>
parents: 9362
diff changeset
1506 b->width_run_cache = 0;
9f797989b817 * buffer.c: #include region-cache.h.
Jim Blandy <jimb@redhat.com>
parents: 9362
diff changeset
1507 }
9f797989b817 * buffer.c: #include region-cache.h.
Jim Blandy <jimb@redhat.com>
parents: 9362
diff changeset
1508 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
1509 UNBLOCK_INPUT;
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1510 b->undo_list = Qnil;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1511
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1512 return Qt;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1513 }
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1514
550
3072b38789a7 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 485
diff changeset
1515 /* 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
1516 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
1517 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
1518 means that other_buffer is more likely to choose a relevant buffer. */
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1519
20368
9f5fab56f4b3 (nsberror, record_buffer, validate_region,
Kenichi Handa <handa@m17n.org>
parents: 20186
diff changeset
1520 void
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1521 record_buffer (buf)
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1522 Lisp_Object buf;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1523 {
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1524 register Lisp_Object link, prev;
22189
2a61a0a3a9be (Fother_buffer): New arg FRAME. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents: 22171
diff changeset
1525 Lisp_Object frame;
25664
832aeb9c3996 (Fother_buffer): Change for Lisp_Object selected_frame.
Gerd Moellmann <gerd@gnu.org>
parents: 25653
diff changeset
1526 frame = selected_frame;
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1527
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1528 prev = Qnil;
26164
d39ec0a27081 more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents: 26088
diff changeset
1529 for (link = Vbuffer_alist; CONSP (link); link = XCDR (link))
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1530 {
26164
d39ec0a27081 more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents: 26088
diff changeset
1531 if (EQ (XCDR (XCAR (link)), buf))
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1532 break;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1533 prev = link;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1534 }
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1535
550
3072b38789a7 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 485
diff changeset
1536 /* Effectively do Vbuffer_alist = Fdelq (link, Vbuffer_alist);
3072b38789a7 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 485
diff changeset
1537 we cannot use Fdelq itself here because it allows quitting. */
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1538
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 392
diff changeset
1539 if (NILP (prev))
26164
d39ec0a27081 more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents: 26088
diff changeset
1540 Vbuffer_alist = XCDR (Vbuffer_alist);
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1541 else
39973
579177964efa Avoid (most) uses of XCAR/XCDR as lvalues, for flexibility in experimenting
Ken Raeburn <raeburn@raeburn.org>
parents: 39971
diff changeset
1542 XSETCDR (prev, XCDR (XCDR (prev)));
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49444
diff changeset
1543
39973
579177964efa Avoid (most) uses of XCAR/XCDR as lvalues, for flexibility in experimenting
Ken Raeburn <raeburn@raeburn.org>
parents: 39971
diff changeset
1544 XSETCDR (link, Vbuffer_alist);
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1545 Vbuffer_alist = link;
17218
a57ca25e9c62 (reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents: 17124
diff changeset
1546
a57ca25e9c62 (reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents: 17124
diff changeset
1547 /* 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
1548
a57ca25e9c62 (reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents: 17124
diff changeset
1549 prev = Qnil;
22189
2a61a0a3a9be (Fother_buffer): New arg FRAME. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents: 22171
diff changeset
1550 for (link = frame_buffer_list (frame); CONSP (link);
26164
d39ec0a27081 more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents: 26088
diff changeset
1551 link = XCDR (link))
17218
a57ca25e9c62 (reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents: 17124
diff changeset
1552 {
26164
d39ec0a27081 more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents: 26088
diff changeset
1553 if (EQ (XCAR (link), buf))
17218
a57ca25e9c62 (reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents: 17124
diff changeset
1554 break;
a57ca25e9c62 (reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents: 17124
diff changeset
1555 prev = link;
a57ca25e9c62 (reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents: 17124
diff changeset
1556 }
a57ca25e9c62 (reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents: 17124
diff changeset
1557
a57ca25e9c62 (reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents: 17124
diff changeset
1558 /* Effectively do delq. */
a57ca25e9c62 (reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents: 17124
diff changeset
1559
a57ca25e9c62 (reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents: 17124
diff changeset
1560 if (CONSP (link))
a57ca25e9c62 (reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents: 17124
diff changeset
1561 {
a57ca25e9c62 (reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents: 17124
diff changeset
1562 if (NILP (prev))
22189
2a61a0a3a9be (Fother_buffer): New arg FRAME. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents: 22171
diff changeset
1563 set_frame_buffer_list (frame,
26164
d39ec0a27081 more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents: 26088
diff changeset
1564 XCDR (frame_buffer_list (frame)));
17218
a57ca25e9c62 (reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents: 17124
diff changeset
1565 else
39973
579177964efa Avoid (most) uses of XCAR/XCDR as lvalues, for flexibility in experimenting
Ken Raeburn <raeburn@raeburn.org>
parents: 39971
diff changeset
1566 XSETCDR (prev, XCDR (XCDR (prev)));
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49444
diff changeset
1567
39973
579177964efa Avoid (most) uses of XCAR/XCDR as lvalues, for flexibility in experimenting
Ken Raeburn <raeburn@raeburn.org>
parents: 39971
diff changeset
1568 XSETCDR (link, frame_buffer_list (frame));
22189
2a61a0a3a9be (Fother_buffer): New arg FRAME. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents: 22171
diff changeset
1569 set_frame_buffer_list (frame, link);
17218
a57ca25e9c62 (reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents: 17124
diff changeset
1570 }
a57ca25e9c62 (reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents: 17124
diff changeset
1571 else
22189
2a61a0a3a9be (Fother_buffer): New arg FRAME. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents: 22171
diff changeset
1572 set_frame_buffer_list (frame, Fcons (buf, frame_buffer_list (frame)));
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1573 }
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1574
9732
577db538b0b6 (Fset_buffer_major_mode): New function. Set the default major mode here.
Karl Heuer <kwzh@gnu.org>
parents: 9632
diff changeset
1575 DEFUN ("set-buffer-major-mode", Fset_buffer_major_mode, Sset_buffer_major_mode, 1, 1, 0,
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39974
diff changeset
1576 doc: /* Set an appropriate major mode for BUFFER.
40605
9c8c502c1713 Fix a typo.
Gerd Moellmann <gerd@gnu.org>
parents: 40567
diff changeset
1577 For the *scratch* buffer, use `initial-major-mode', otherwise choose a mode
39974
a72c97b251de (Fset_buffer_major_mode): Use initial-major-mode for
Gerd Moellmann <gerd@gnu.org>
parents: 39973
diff changeset
1578 according to `default-major-mode'.
39971
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
1579 Use this function before selecting the buffer, since it may need to inspect
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39974
diff changeset
1580 the current buffer's major mode. */)
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39974
diff changeset
1581 (buffer)
14060
b62397f49a24 (Fmake_indirect_buffer, Fset_buffer_major_mode, Fpop_to_buffer,
Erik Naggum <erik@naggum.no>
parents: 13922
diff changeset
1582 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
1583 {
577db538b0b6 (Fset_buffer_major_mode): New function. Set the default major mode here.
Karl Heuer <kwzh@gnu.org>
parents: 9632
diff changeset
1584 int count;
577db538b0b6 (Fset_buffer_major_mode): New function. Set the default major mode here.
Karl Heuer <kwzh@gnu.org>
parents: 9632
diff changeset
1585 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
1586
39974
a72c97b251de (Fset_buffer_major_mode): Use initial-major-mode for
Gerd Moellmann <gerd@gnu.org>
parents: 39973
diff changeset
1587 if (STRINGP (XBUFFER (buffer)->name)
46370
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46293
diff changeset
1588 && strcmp (SDATA (XBUFFER (buffer)->name), "*scratch*") == 0)
39974
a72c97b251de (Fset_buffer_major_mode): Use initial-major-mode for
Gerd Moellmann <gerd@gnu.org>
parents: 39973
diff changeset
1589 function = find_symbol_value (intern ("initial-major-mode"));
a72c97b251de (Fset_buffer_major_mode): Use initial-major-mode for
Gerd Moellmann <gerd@gnu.org>
parents: 39973
diff changeset
1590 else
a72c97b251de (Fset_buffer_major_mode): Use initial-major-mode for
Gerd Moellmann <gerd@gnu.org>
parents: 39973
diff changeset
1591 {
a72c97b251de (Fset_buffer_major_mode): Use initial-major-mode for
Gerd Moellmann <gerd@gnu.org>
parents: 39973
diff changeset
1592 function = buffer_defaults.major_mode;
a72c97b251de (Fset_buffer_major_mode): Use initial-major-mode for
Gerd Moellmann <gerd@gnu.org>
parents: 39973
diff changeset
1593 if (NILP (function)
a72c97b251de (Fset_buffer_major_mode): Use initial-major-mode for
Gerd Moellmann <gerd@gnu.org>
parents: 39973
diff changeset
1594 && NILP (Fget (current_buffer->major_mode, Qmode_class)))
a72c97b251de (Fset_buffer_major_mode): Use initial-major-mode for
Gerd Moellmann <gerd@gnu.org>
parents: 39973
diff changeset
1595 function = current_buffer->major_mode;
a72c97b251de (Fset_buffer_major_mode): Use initial-major-mode for
Gerd Moellmann <gerd@gnu.org>
parents: 39973
diff changeset
1596 }
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49444
diff changeset
1597
48635
2a9a1d761581 (Qucs_set_table_for_input): New.
Dave Love <fx@gnu.org>
parents: 48355
diff changeset
1598 if (NILP (function) || EQ (function, Qfundamental_mode))
2a9a1d761581 (Qucs_set_table_for_input): New.
Dave Love <fx@gnu.org>
parents: 48355
diff changeset
1599 return Qnil;
2a9a1d761581 (Qucs_set_table_for_input): New.
Dave Love <fx@gnu.org>
parents: 48355
diff changeset
1600
46293
1fb8f75062c6 Use macro SPECPDL_INDEX.
Juanma Barranquero <lekktu@gmail.com>
parents: 46199
diff changeset
1601 count = SPECPDL_INDEX ();
9732
577db538b0b6 (Fset_buffer_major_mode): New function. Set the default major mode here.
Karl Heuer <kwzh@gnu.org>
parents: 9632
diff changeset
1602
48635
2a9a1d761581 (Qucs_set_table_for_input): New.
Dave Love <fx@gnu.org>
parents: 48355
diff changeset
1603 /* To select a nonfundamental mode,
2a9a1d761581 (Qucs_set_table_for_input): New.
Dave Love <fx@gnu.org>
parents: 48355
diff changeset
1604 select the buffer temporarily and then call the mode function. */
9732
577db538b0b6 (Fset_buffer_major_mode): New function. Set the default major mode here.
Karl Heuer <kwzh@gnu.org>
parents: 9632
diff changeset
1605
577db538b0b6 (Fset_buffer_major_mode): New function. Set the default major mode here.
Karl Heuer <kwzh@gnu.org>
parents: 9632
diff changeset
1606 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
1607
14060
b62397f49a24 (Fmake_indirect_buffer, Fset_buffer_major_mode, Fpop_to_buffer,
Erik Naggum <erik@naggum.no>
parents: 13922
diff changeset
1608 Fset_buffer (buffer);
48635
2a9a1d761581 (Qucs_set_table_for_input): New.
Dave Love <fx@gnu.org>
parents: 48355
diff changeset
1609 call0 (function);
9732
577db538b0b6 (Fset_buffer_major_mode): New function. Set the default major mode here.
Karl Heuer <kwzh@gnu.org>
parents: 9632
diff changeset
1610
577db538b0b6 (Fset_buffer_major_mode): New function. Set the default major mode here.
Karl Heuer <kwzh@gnu.org>
parents: 9632
diff changeset
1611 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
1612 }
577db538b0b6 (Fset_buffer_major_mode): New function. Set the default major mode here.
Karl Heuer <kwzh@gnu.org>
parents: 9632
diff changeset
1613
25181
847441efad8d (switch_to_buffer_1): New subroutine, taken out from Fswitch_to_buffer.
Richard M. Stallman <rms@gnu.org>
parents: 25021
diff changeset
1614 /* If switching buffers in WINDOW would be an error, return
847441efad8d (switch_to_buffer_1): New subroutine, taken out from Fswitch_to_buffer.
Richard M. Stallman <rms@gnu.org>
parents: 25021
diff changeset
1615 a C string saying what the error would be. */
847441efad8d (switch_to_buffer_1): New subroutine, taken out from Fswitch_to_buffer.
Richard M. Stallman <rms@gnu.org>
parents: 25021
diff changeset
1616
847441efad8d (switch_to_buffer_1): New subroutine, taken out from Fswitch_to_buffer.
Richard M. Stallman <rms@gnu.org>
parents: 25021
diff changeset
1617 char *
847441efad8d (switch_to_buffer_1): New subroutine, taken out from Fswitch_to_buffer.
Richard M. Stallman <rms@gnu.org>
parents: 25021
diff changeset
1618 no_switch_window (window)
847441efad8d (switch_to_buffer_1): New subroutine, taken out from Fswitch_to_buffer.
Richard M. Stallman <rms@gnu.org>
parents: 25021
diff changeset
1619 Lisp_Object window;
847441efad8d (switch_to_buffer_1): New subroutine, taken out from Fswitch_to_buffer.
Richard M. Stallman <rms@gnu.org>
parents: 25021
diff changeset
1620 {
847441efad8d (switch_to_buffer_1): New subroutine, taken out from Fswitch_to_buffer.
Richard M. Stallman <rms@gnu.org>
parents: 25021
diff changeset
1621 Lisp_Object tem;
847441efad8d (switch_to_buffer_1): New subroutine, taken out from Fswitch_to_buffer.
Richard M. Stallman <rms@gnu.org>
parents: 25021
diff changeset
1622 if (EQ (minibuf_window, window))
847441efad8d (switch_to_buffer_1): New subroutine, taken out from Fswitch_to_buffer.
Richard M. Stallman <rms@gnu.org>
parents: 25021
diff changeset
1623 return "Cannot switch buffers in minibuffer window";
847441efad8d (switch_to_buffer_1): New subroutine, taken out from Fswitch_to_buffer.
Richard M. Stallman <rms@gnu.org>
parents: 25021
diff changeset
1624 tem = Fwindow_dedicated_p (window);
43712
223f1f5d160d (syms_of_buffer): Allow non-string `mode-name'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 43630
diff changeset
1625 if (EQ (tem, Qt))
25181
847441efad8d (switch_to_buffer_1): New subroutine, taken out from Fswitch_to_buffer.
Richard M. Stallman <rms@gnu.org>
parents: 25021
diff changeset
1626 return "Cannot switch buffers in a dedicated window";
847441efad8d (switch_to_buffer_1): New subroutine, taken out from Fswitch_to_buffer.
Richard M. Stallman <rms@gnu.org>
parents: 25021
diff changeset
1627 return NULL;
847441efad8d (switch_to_buffer_1): New subroutine, taken out from Fswitch_to_buffer.
Richard M. Stallman <rms@gnu.org>
parents: 25021
diff changeset
1628 }
847441efad8d (switch_to_buffer_1): New subroutine, taken out from Fswitch_to_buffer.
Richard M. Stallman <rms@gnu.org>
parents: 25021
diff changeset
1629
847441efad8d (switch_to_buffer_1): New subroutine, taken out from Fswitch_to_buffer.
Richard M. Stallman <rms@gnu.org>
parents: 25021
diff changeset
1630 /* Switch to buffer BUFFER in the selected window.
847441efad8d (switch_to_buffer_1): New subroutine, taken out from Fswitch_to_buffer.
Richard M. Stallman <rms@gnu.org>
parents: 25021
diff changeset
1631 If NORECORD is non-nil, don't call record_buffer. */
847441efad8d (switch_to_buffer_1): New subroutine, taken out from Fswitch_to_buffer.
Richard M. Stallman <rms@gnu.org>
parents: 25021
diff changeset
1632
847441efad8d (switch_to_buffer_1): New subroutine, taken out from Fswitch_to_buffer.
Richard M. Stallman <rms@gnu.org>
parents: 25021
diff changeset
1633 Lisp_Object
847441efad8d (switch_to_buffer_1): New subroutine, taken out from Fswitch_to_buffer.
Richard M. Stallman <rms@gnu.org>
parents: 25021
diff changeset
1634 switch_to_buffer_1 (buffer, norecord)
13762
71c14edf7d6d (Fkill_buffer): Rename arg bufname to buffer.
Karl Heuer <kwzh@gnu.org>
parents: 13446
diff changeset
1635 Lisp_Object buffer, norecord;
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1636 {
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1637 register Lisp_Object buf;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1638
13762
71c14edf7d6d (Fkill_buffer): Rename arg bufname to buffer.
Karl Heuer <kwzh@gnu.org>
parents: 13446
diff changeset
1639 if (NILP (buffer))
22189
2a61a0a3a9be (Fother_buffer): New arg FRAME. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents: 22171
diff changeset
1640 buf = Fother_buffer (Fcurrent_buffer (), Qnil, Qnil);
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1641 else
9732
577db538b0b6 (Fset_buffer_major_mode): New function. Set the default major mode here.
Karl Heuer <kwzh@gnu.org>
parents: 9632
diff changeset
1642 {
13762
71c14edf7d6d (Fkill_buffer): Rename arg bufname to buffer.
Karl Heuer <kwzh@gnu.org>
parents: 13446
diff changeset
1643 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
1644 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
1645 {
13762
71c14edf7d6d (Fkill_buffer): Rename arg bufname to buffer.
Karl Heuer <kwzh@gnu.org>
parents: 13446
diff changeset
1646 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
1647 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
1648 }
577db538b0b6 (Fset_buffer_major_mode): New function. Set the default major mode here.
Karl Heuer <kwzh@gnu.org>
parents: 9632
diff changeset
1649 }
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1650 Fset_buffer (buf);
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 392
diff changeset
1651 if (NILP (norecord))
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1652 record_buffer (buf);
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1653
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1654 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
1655 ? 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
1656 : selected_window,
51190
17af4bfeb062 (init_buffer_once): Set buffer_defaults and
Kim F. Storm <storm@cua.dk>
parents: 51166
diff changeset
1657 buf, Qnil);
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1658
16840
299b0e0f0a93 Fix typo editing previous change.
Richard M. Stallman <rms@gnu.org>
parents: 16830
diff changeset
1659 return buf;
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1660 }
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1661
25181
847441efad8d (switch_to_buffer_1): New subroutine, taken out from Fswitch_to_buffer.
Richard M. Stallman <rms@gnu.org>
parents: 25021
diff changeset
1662 DEFUN ("switch-to-buffer", Fswitch_to_buffer, Sswitch_to_buffer, 1, 2, "BSwitch to buffer: ",
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39974
diff changeset
1663 doc: /* Select buffer BUFFER in the current window.
56396
f1ddf2e65cd3 (Fswitch_to_buffer, Fpop_to_buffer): Doc fixes.
Luc Teirlinck <teirllm@auburn.edu>
parents: 56172
diff changeset
1664 If BUFFER does not identify an existing buffer,
f1ddf2e65cd3 (Fswitch_to_buffer, Fpop_to_buffer): Doc fixes.
Luc Teirlinck <teirllm@auburn.edu>
parents: 56172
diff changeset
1665 then this function creates a buffer with that name.
f1ddf2e65cd3 (Fswitch_to_buffer, Fpop_to_buffer): Doc fixes.
Luc Teirlinck <teirllm@auburn.edu>
parents: 56172
diff changeset
1666
f1ddf2e65cd3 (Fswitch_to_buffer, Fpop_to_buffer): Doc fixes.
Luc Teirlinck <teirllm@auburn.edu>
parents: 56172
diff changeset
1667 When called from Lisp, BUFFER may be a buffer, a string \(a buffer name),
f1ddf2e65cd3 (Fswitch_to_buffer, Fpop_to_buffer): Doc fixes.
Luc Teirlinck <teirllm@auburn.edu>
parents: 56172
diff changeset
1668 or nil. If BUFFER is nil, then this function chooses a buffer
f1ddf2e65cd3 (Fswitch_to_buffer, Fpop_to_buffer): Doc fixes.
Luc Teirlinck <teirllm@auburn.edu>
parents: 56172
diff changeset
1669 using `other-buffer'.
39971
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
1670 Optional second arg NORECORD non-nil means
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
1671 do not put this buffer at the front of the list of recently selected ones.
56396
f1ddf2e65cd3 (Fswitch_to_buffer, Fpop_to_buffer): Doc fixes.
Luc Teirlinck <teirllm@auburn.edu>
parents: 56172
diff changeset
1672 This function returns the buffer it switched to.
39971
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
1673
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
1674 WARNING: This is NOT the way to work on another buffer temporarily
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
1675 within a Lisp program! Use `set-buffer' instead. That avoids messing with
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39974
diff changeset
1676 the window-buffer correspondences. */)
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39974
diff changeset
1677 (buffer, norecord)
25181
847441efad8d (switch_to_buffer_1): New subroutine, taken out from Fswitch_to_buffer.
Richard M. Stallman <rms@gnu.org>
parents: 25021
diff changeset
1678 Lisp_Object buffer, norecord;
847441efad8d (switch_to_buffer_1): New subroutine, taken out from Fswitch_to_buffer.
Richard M. Stallman <rms@gnu.org>
parents: 25021
diff changeset
1679 {
847441efad8d (switch_to_buffer_1): New subroutine, taken out from Fswitch_to_buffer.
Richard M. Stallman <rms@gnu.org>
parents: 25021
diff changeset
1680 char *err;
847441efad8d (switch_to_buffer_1): New subroutine, taken out from Fswitch_to_buffer.
Richard M. Stallman <rms@gnu.org>
parents: 25021
diff changeset
1681
51939
d38453fdf2a0 (copy_overlays): Use EMACS_INT for positions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51867
diff changeset
1682 if (EQ (buffer, Fwindow_buffer (selected_window)))
d38453fdf2a0 (copy_overlays): Use EMACS_INT for positions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51867
diff changeset
1683 /* Basically a NOP. Avoid signalling an error if the selected window
d38453fdf2a0 (copy_overlays): Use EMACS_INT for positions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51867
diff changeset
1684 is dedicated, or a minibuffer, ... */
d38453fdf2a0 (copy_overlays): Use EMACS_INT for positions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51867
diff changeset
1685 return Fset_buffer (buffer);
d38453fdf2a0 (copy_overlays): Use EMACS_INT for positions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51867
diff changeset
1686
25181
847441efad8d (switch_to_buffer_1): New subroutine, taken out from Fswitch_to_buffer.
Richard M. Stallman <rms@gnu.org>
parents: 25021
diff changeset
1687 err = no_switch_window (selected_window);
847441efad8d (switch_to_buffer_1): New subroutine, taken out from Fswitch_to_buffer.
Richard M. Stallman <rms@gnu.org>
parents: 25021
diff changeset
1688 if (err) error (err);
847441efad8d (switch_to_buffer_1): New subroutine, taken out from Fswitch_to_buffer.
Richard M. Stallman <rms@gnu.org>
parents: 25021
diff changeset
1689
847441efad8d (switch_to_buffer_1): New subroutine, taken out from Fswitch_to_buffer.
Richard M. Stallman <rms@gnu.org>
parents: 25021
diff changeset
1690 return switch_to_buffer_1 (buffer, norecord);
847441efad8d (switch_to_buffer_1): New subroutine, taken out from Fswitch_to_buffer.
Richard M. Stallman <rms@gnu.org>
parents: 25021
diff changeset
1691 }
847441efad8d (switch_to_buffer_1): New subroutine, taken out from Fswitch_to_buffer.
Richard M. Stallman <rms@gnu.org>
parents: 25021
diff changeset
1692
16840
299b0e0f0a93 Fix typo editing previous change.
Richard M. Stallman <rms@gnu.org>
parents: 16830
diff changeset
1693 DEFUN ("pop-to-buffer", Fpop_to_buffer, Spop_to_buffer, 1, 3, 0,
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39974
diff changeset
1694 doc: /* Select buffer BUFFER in some window, preferably a different one.
56396
f1ddf2e65cd3 (Fswitch_to_buffer, Fpop_to_buffer): Doc fixes.
Luc Teirlinck <teirllm@auburn.edu>
parents: 56172
diff changeset
1695 BUFFER may be a buffer, a string \(a buffer name), or nil.
f1ddf2e65cd3 (Fswitch_to_buffer, Fpop_to_buffer): Doc fixes.
Luc Teirlinck <teirllm@auburn.edu>
parents: 56172
diff changeset
1696 If BUFFER is a string which is not the name of an existing buffer,
f1ddf2e65cd3 (Fswitch_to_buffer, Fpop_to_buffer): Doc fixes.
Luc Teirlinck <teirllm@auburn.edu>
parents: 56172
diff changeset
1697 then this function creates a buffer with that name.
f1ddf2e65cd3 (Fswitch_to_buffer, Fpop_to_buffer): Doc fixes.
Luc Teirlinck <teirllm@auburn.edu>
parents: 56172
diff changeset
1698 If BUFFER is nil, then it chooses some other buffer.
39971
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
1699 If `pop-up-windows' is non-nil, windows can be split to do this.
55140
98453142b576 (Fpop_to_buffer): Fix docstring.
Juanma Barranquero <lekktu@gmail.com>
parents: 54949
diff changeset
1700 If optional second arg OTHER-WINDOW is non-nil, insist on finding another
54266
840b8997440d (Fpop_to_buffer): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 53958
diff changeset
1701 window even if BUFFER is already visible in the selected window,
840b8997440d (Fpop_to_buffer): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 53958
diff changeset
1702 and ignore `same-window-regexps' and `same-window-buffer-names'.
56396
f1ddf2e65cd3 (Fswitch_to_buffer, Fpop_to_buffer): Doc fixes.
Luc Teirlinck <teirllm@auburn.edu>
parents: 56172
diff changeset
1703 This function returns the buffer it switched to.
39971
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
1704 This uses the function `display-buffer' as a subroutine; see the documentation
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
1705 of `display-buffer' for additional customization information.
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
1706
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
1707 Optional third arg NORECORD non-nil means
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39974
diff changeset
1708 do not put this buffer at the front of the list of recently selected ones. */)
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39974
diff changeset
1709 (buffer, other_window, norecord)
16830
4792e73d511f (Fpop_to_buffer): New arg NORECORD.
Richard M. Stallman <rms@gnu.org>
parents: 16665
diff changeset
1710 Lisp_Object buffer, other_window, norecord;
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1711 {
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1712 register Lisp_Object buf;
13762
71c14edf7d6d (Fkill_buffer): Rename arg bufname to buffer.
Karl Heuer <kwzh@gnu.org>
parents: 13446
diff changeset
1713 if (NILP (buffer))
22189
2a61a0a3a9be (Fother_buffer): New arg FRAME. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents: 22171
diff changeset
1714 buf = Fother_buffer (Fcurrent_buffer (), Qnil, Qnil);
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1715 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
1716 {
13762
71c14edf7d6d (Fkill_buffer): Rename arg bufname to buffer.
Karl Heuer <kwzh@gnu.org>
parents: 13446
diff changeset
1717 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
1718 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
1719 {
13762
71c14edf7d6d (Fkill_buffer): Rename arg bufname to buffer.
Karl Heuer <kwzh@gnu.org>
parents: 13446
diff changeset
1720 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
1721 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
1722 }
3aea65d9eb68 (Fpop_to_buffer): Call Fset_buffer_major_mode if we create a buffer.
Richard M. Stallman <rms@gnu.org>
parents: 10751
diff changeset
1723 }
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1724 Fset_buffer (buf);
16830
4792e73d511f (Fpop_to_buffer): New arg NORECORD.
Richard M. Stallman <rms@gnu.org>
parents: 16665
diff changeset
1725 if (NILP (norecord))
51048
7ac9c3bea5ea (Fselect_window): Add optional arg `norecord'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50605
diff changeset
1726 /* Why bother ? Fselect_window will do it for us anyway. -stef */
16830
4792e73d511f (Fpop_to_buffer): New arg NORECORD.
Richard M. Stallman <rms@gnu.org>
parents: 16665
diff changeset
1727 record_buffer (buf);
51048
7ac9c3bea5ea (Fselect_window): Add optional arg `norecord'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50605
diff changeset
1728 Fselect_window (Fdisplay_buffer (buf, other_window, Qnil), norecord);
3295
4d405f172c79 (reset_buffer): Clear mark_active field here.
Richard M. Stallman <rms@gnu.org>
parents: 3242
diff changeset
1729 return buf;
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1730 }
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1731
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1732 DEFUN ("current-buffer", Fcurrent_buffer, Scurrent_buffer, 0, 0, 0,
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39974
diff changeset
1733 doc: /* Return the current buffer as a Lisp object. */)
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39974
diff changeset
1734 ()
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1735 {
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1736 register Lisp_Object buf;
9262
582534b6e763 (Fget_buffer_create, Frename_buffer, Fbuffer_disable_undo,
Karl Heuer <kwzh@gnu.org>
parents: 9211
diff changeset
1737 XSETBUFFER (buf, current_buffer);
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1738 return buf;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1739 }
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1740
25491
0359edc6e428 (set_buffer_internal): Never set
Gerd Moellmann <gerd@gnu.org>
parents: 25368
diff changeset
1741 /* Set the current buffer to B.
0359edc6e428 (set_buffer_internal): Never set
Gerd Moellmann <gerd@gnu.org>
parents: 25368
diff changeset
1742
0359edc6e428 (set_buffer_internal): Never set
Gerd Moellmann <gerd@gnu.org>
parents: 25368
diff changeset
1743 We previously set windows_or_buffers_changed here to invalidate
0359edc6e428 (set_buffer_internal): Never set
Gerd Moellmann <gerd@gnu.org>
parents: 25368
diff changeset
1744 global unchanged information in beg_unchanged and end_unchanged.
0359edc6e428 (set_buffer_internal): Never set
Gerd Moellmann <gerd@gnu.org>
parents: 25368
diff changeset
1745 This is no longer necessary because we now compute unchanged
0359edc6e428 (set_buffer_internal): Never set
Gerd Moellmann <gerd@gnu.org>
parents: 25368
diff changeset
1746 information on a buffer-basis. Every action affecting other
0359edc6e428 (set_buffer_internal): Never set
Gerd Moellmann <gerd@gnu.org>
parents: 25368
diff changeset
1747 windows than the selected one requires a select_window at some
0359edc6e428 (set_buffer_internal): Never set
Gerd Moellmann <gerd@gnu.org>
parents: 25368
diff changeset
1748 time, and that increments windows_or_buffers_changed. */
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1749
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1750 void
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1751 set_buffer_internal (b)
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1752 register struct buffer *b;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1753 {
25368
f9949db6ca7d (set_buffer_internal): Set windows_or_buffers_changed
Gerd Moellmann <gerd@gnu.org>
parents: 25351
diff changeset
1754 if (current_buffer != b)
25491
0359edc6e428 (set_buffer_internal): Never set
Gerd Moellmann <gerd@gnu.org>
parents: 25368
diff changeset
1755 set_buffer_internal_1 (b);
11889
1067ddd12dfc (set_buffer_internal_1): New subroutine.
Karl Heuer <kwzh@gnu.org>
parents: 11838
diff changeset
1756 }
1067ddd12dfc (set_buffer_internal_1): New subroutine.
Karl Heuer <kwzh@gnu.org>
parents: 11838
diff changeset
1757
1067ddd12dfc (set_buffer_internal_1): New subroutine.
Karl Heuer <kwzh@gnu.org>
parents: 11838
diff changeset
1758 /* 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
1759 This is used by redisplay. */
1067ddd12dfc (set_buffer_internal_1): New subroutine.
Karl Heuer <kwzh@gnu.org>
parents: 11838
diff changeset
1760
1067ddd12dfc (set_buffer_internal_1): New subroutine.
Karl Heuer <kwzh@gnu.org>
parents: 11838
diff changeset
1761 void
1067ddd12dfc (set_buffer_internal_1): New subroutine.
Karl Heuer <kwzh@gnu.org>
parents: 11838
diff changeset
1762 set_buffer_internal_1 (b)
1067ddd12dfc (set_buffer_internal_1): New subroutine.
Karl Heuer <kwzh@gnu.org>
parents: 11838
diff changeset
1763 register struct buffer *b;
1067ddd12dfc (set_buffer_internal_1): New subroutine.
Karl Heuer <kwzh@gnu.org>
parents: 11838
diff changeset
1764 {
1067ddd12dfc (set_buffer_internal_1): New subroutine.
Karl Heuer <kwzh@gnu.org>
parents: 11838
diff changeset
1765 register struct buffer *old_buf;
1067ddd12dfc (set_buffer_internal_1): New subroutine.
Karl Heuer <kwzh@gnu.org>
parents: 11838
diff changeset
1766 register Lisp_Object tail, valcontents;
1067ddd12dfc (set_buffer_internal_1): New subroutine.
Karl Heuer <kwzh@gnu.org>
parents: 11838
diff changeset
1767 Lisp_Object tem;
1067ddd12dfc (set_buffer_internal_1): New subroutine.
Karl Heuer <kwzh@gnu.org>
parents: 11838
diff changeset
1768
31604
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
1769 #ifdef USE_MMAP_FOR_BUFFERS
31416
9b8c5bea5e8d (set_buffer_internal_1) [REL_ALLOC_MMAP]: If
Gerd Moellmann <gerd@gnu.org>
parents: 31412
diff changeset
1770 if (b->text->beg == NULL)
31604
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
1771 enlarge_buffer_text (b, 0);
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
1772 #endif /* USE_MMAP_FOR_BUFFERS */
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49444
diff changeset
1773
11889
1067ddd12dfc (set_buffer_internal_1): New subroutine.
Karl Heuer <kwzh@gnu.org>
parents: 11838
diff changeset
1774 if (current_buffer == b)
1067ddd12dfc (set_buffer_internal_1): New subroutine.
Karl Heuer <kwzh@gnu.org>
parents: 11838
diff changeset
1775 return;
1067ddd12dfc (set_buffer_internal_1): New subroutine.
Karl Heuer <kwzh@gnu.org>
parents: 11838
diff changeset
1776
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1777 old_buf = current_buffer;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1778 current_buffer = b;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1779 last_known_column_point = -1; /* invalidate indentation cache */
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1780
10314
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1781 if (old_buf)
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1782 {
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1783 /* 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
1784 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
1785 if (old_buf->base_buffer)
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1786 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
1787
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1788 /* 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
1789 when it is not current, update them now. */
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1790 if (! NILP (old_buf->pt_marker))
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1791 {
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1792 Lisp_Object obuf;
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1793 XSETBUFFER (obuf, old_buf);
20538
b964f3facafa (Fmake_indirect_buffer): Use set_marker_both.
Richard M. Stallman <rms@gnu.org>
parents: 20368
diff changeset
1794 set_marker_both (old_buf->pt_marker, obuf,
b964f3facafa (Fmake_indirect_buffer): Use set_marker_both.
Richard M. Stallman <rms@gnu.org>
parents: 20368
diff changeset
1795 BUF_PT (old_buf), BUF_PT_BYTE (old_buf));
10314
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1796 }
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1797 if (! NILP (old_buf->begv_marker))
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1798 {
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1799 Lisp_Object obuf;
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1800 XSETBUFFER (obuf, old_buf);
20538
b964f3facafa (Fmake_indirect_buffer): Use set_marker_both.
Richard M. Stallman <rms@gnu.org>
parents: 20368
diff changeset
1801 set_marker_both (old_buf->begv_marker, obuf,
b964f3facafa (Fmake_indirect_buffer): Use set_marker_both.
Richard M. Stallman <rms@gnu.org>
parents: 20368
diff changeset
1802 BUF_BEGV (old_buf), BUF_BEGV_BYTE (old_buf));
10314
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1803 }
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1804 if (! NILP (old_buf->zv_marker))
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1805 {
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1806 Lisp_Object obuf;
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1807 XSETBUFFER (obuf, old_buf);
20538
b964f3facafa (Fmake_indirect_buffer): Use set_marker_both.
Richard M. Stallman <rms@gnu.org>
parents: 20368
diff changeset
1808 set_marker_both (old_buf->zv_marker, obuf,
b964f3facafa (Fmake_indirect_buffer): Use set_marker_both.
Richard M. Stallman <rms@gnu.org>
parents: 20368
diff changeset
1809 BUF_ZV (old_buf), BUF_ZV_BYTE (old_buf));
10314
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1810 }
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1811 }
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1812
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1813 /* 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
1814 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
1815 if (b->base_buffer)
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1816 b->undo_list = b->base_buffer->undo_list;
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1817
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1818 /* 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
1819 when it is not current, fetch them now. */
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1820 if (! NILP (b->pt_marker))
20538
b964f3facafa (Fmake_indirect_buffer): Use set_marker_both.
Richard M. Stallman <rms@gnu.org>
parents: 20368
diff changeset
1821 {
b964f3facafa (Fmake_indirect_buffer): Use set_marker_both.
Richard M. Stallman <rms@gnu.org>
parents: 20368
diff changeset
1822 BUF_PT (b) = marker_position (b->pt_marker);
b964f3facafa (Fmake_indirect_buffer): Use set_marker_both.
Richard M. Stallman <rms@gnu.org>
parents: 20368
diff changeset
1823 BUF_PT_BYTE (b) = marker_byte_position (b->pt_marker);
b964f3facafa (Fmake_indirect_buffer): Use set_marker_both.
Richard M. Stallman <rms@gnu.org>
parents: 20368
diff changeset
1824 }
10314
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1825 if (! NILP (b->begv_marker))
20538
b964f3facafa (Fmake_indirect_buffer): Use set_marker_both.
Richard M. Stallman <rms@gnu.org>
parents: 20368
diff changeset
1826 {
b964f3facafa (Fmake_indirect_buffer): Use set_marker_both.
Richard M. Stallman <rms@gnu.org>
parents: 20368
diff changeset
1827 BUF_BEGV (b) = marker_position (b->begv_marker);
b964f3facafa (Fmake_indirect_buffer): Use set_marker_both.
Richard M. Stallman <rms@gnu.org>
parents: 20368
diff changeset
1828 BUF_BEGV_BYTE (b) = marker_byte_position (b->begv_marker);
b964f3facafa (Fmake_indirect_buffer): Use set_marker_both.
Richard M. Stallman <rms@gnu.org>
parents: 20368
diff changeset
1829 }
10314
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1830 if (! NILP (b->zv_marker))
20538
b964f3facafa (Fmake_indirect_buffer): Use set_marker_both.
Richard M. Stallman <rms@gnu.org>
parents: 20368
diff changeset
1831 {
b964f3facafa (Fmake_indirect_buffer): Use set_marker_both.
Richard M. Stallman <rms@gnu.org>
parents: 20368
diff changeset
1832 BUF_ZV (b) = marker_position (b->zv_marker);
b964f3facafa (Fmake_indirect_buffer): Use set_marker_both.
Richard M. Stallman <rms@gnu.org>
parents: 20368
diff changeset
1833 BUF_ZV_BYTE (b) = marker_byte_position (b->zv_marker);
b964f3facafa (Fmake_indirect_buffer): Use set_marker_both.
Richard M. Stallman <rms@gnu.org>
parents: 20368
diff changeset
1834 }
10314
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1835
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1836 /* Look down buffer's list of local Lisp variables
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1837 to find and update any that forward into C variables. */
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1838
51669
f3dc77591fe2 (set_buffer_internal_1): Test CONSP for lists.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51431
diff changeset
1839 for (tail = b->local_var_alist; CONSP (tail); tail = XCDR (tail))
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1840 {
39581
6d9fa06012a6 Use SYMBOL_VALUE/SET_SYMBOL_VALUE macros instead of accessing
Gerd Moellmann <gerd@gnu.org>
parents: 39337
diff changeset
1841 valcontents = SYMBOL_VALUE (XCAR (XCAR (tail)));
9146
8f966cc4652b (nsberror, Fget_buffer, Fget_file_buffer, Fbuffer_local_variables,
Karl Heuer <kwzh@gnu.org>
parents: 9047
diff changeset
1842 if ((BUFFER_LOCAL_VALUEP (valcontents)
8f966cc4652b (nsberror, Fget_buffer, Fget_file_buffer, Fbuffer_local_variables,
Karl Heuer <kwzh@gnu.org>
parents: 9047
diff changeset
1843 || SOME_BUFFER_LOCAL_VALUEP (valcontents))
21141
e30cebe8ae7c (init_buffer): Call Fset_buffer_multibyte for *scratch*.
Richard M. Stallman <rms@gnu.org>
parents: 21085
diff changeset
1844 && (tem = XBUFFER_LOCAL_VALUE (valcontents)->realvalue,
9146
8f966cc4652b (nsberror, Fget_buffer, Fget_file_buffer, Fbuffer_local_variables,
Karl Heuer <kwzh@gnu.org>
parents: 9047
diff changeset
1845 (BOOLFWDP (tem) || INTFWDP (tem) || OBJFWDP (tem))))
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1846 /* Just reference the variable
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1847 to cause it to become set for this buffer. */
26164
d39ec0a27081 more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents: 26088
diff changeset
1848 Fsymbol_value (XCAR (XCAR (tail)));
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1849 }
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1850
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1851 /* Do the same with any others that were local to the previous buffer */
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1852
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1853 if (old_buf)
51669
f3dc77591fe2 (set_buffer_internal_1): Test CONSP for lists.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51431
diff changeset
1854 for (tail = old_buf->local_var_alist; CONSP (tail); tail = XCDR (tail))
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1855 {
39581
6d9fa06012a6 Use SYMBOL_VALUE/SET_SYMBOL_VALUE macros instead of accessing
Gerd Moellmann <gerd@gnu.org>
parents: 39337
diff changeset
1856 valcontents = SYMBOL_VALUE (XCAR (XCAR (tail)));
9146
8f966cc4652b (nsberror, Fget_buffer, Fget_file_buffer, Fbuffer_local_variables,
Karl Heuer <kwzh@gnu.org>
parents: 9047
diff changeset
1857 if ((BUFFER_LOCAL_VALUEP (valcontents)
8f966cc4652b (nsberror, Fget_buffer, Fget_file_buffer, Fbuffer_local_variables,
Karl Heuer <kwzh@gnu.org>
parents: 9047
diff changeset
1858 || SOME_BUFFER_LOCAL_VALUEP (valcontents))
21141
e30cebe8ae7c (init_buffer): Call Fset_buffer_multibyte for *scratch*.
Richard M. Stallman <rms@gnu.org>
parents: 21085
diff changeset
1859 && (tem = XBUFFER_LOCAL_VALUE (valcontents)->realvalue,
9146
8f966cc4652b (nsberror, Fget_buffer, Fget_file_buffer, Fbuffer_local_variables,
Karl Heuer <kwzh@gnu.org>
parents: 9047
diff changeset
1860 (BOOLFWDP (tem) || INTFWDP (tem) || OBJFWDP (tem))))
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1861 /* Just reference the variable
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1862 to cause it to become set for this buffer. */
26164
d39ec0a27081 more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents: 26088
diff changeset
1863 Fsymbol_value (XCAR (XCAR (tail)));
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1864 }
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1865 }
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1866
10314
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1867 /* 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
1868 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
1869
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1870 void
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1871 set_buffer_temp (b)
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1872 struct buffer *b;
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1873 {
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1874 register struct buffer *old_buf;
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1875
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1876 if (current_buffer == b)
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1877 return;
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1878
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1879 old_buf = current_buffer;
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1880 current_buffer = b;
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1881
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1882 if (old_buf)
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1883 {
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1884 /* 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
1885 when it is not current, update them now. */
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1886 if (! NILP (old_buf->pt_marker))
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1887 {
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1888 Lisp_Object obuf;
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1889 XSETBUFFER (obuf, old_buf);
20538
b964f3facafa (Fmake_indirect_buffer): Use set_marker_both.
Richard M. Stallman <rms@gnu.org>
parents: 20368
diff changeset
1890 set_marker_both (old_buf->pt_marker, obuf,
b964f3facafa (Fmake_indirect_buffer): Use set_marker_both.
Richard M. Stallman <rms@gnu.org>
parents: 20368
diff changeset
1891 BUF_PT (old_buf), BUF_PT_BYTE (old_buf));
10314
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1892 }
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1893 if (! NILP (old_buf->begv_marker))
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1894 {
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1895 Lisp_Object obuf;
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1896 XSETBUFFER (obuf, old_buf);
20538
b964f3facafa (Fmake_indirect_buffer): Use set_marker_both.
Richard M. Stallman <rms@gnu.org>
parents: 20368
diff changeset
1897 set_marker_both (old_buf->begv_marker, obuf,
b964f3facafa (Fmake_indirect_buffer): Use set_marker_both.
Richard M. Stallman <rms@gnu.org>
parents: 20368
diff changeset
1898 BUF_BEGV (old_buf), BUF_BEGV_BYTE (old_buf));
10314
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1899 }
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1900 if (! NILP (old_buf->zv_marker))
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1901 {
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1902 Lisp_Object obuf;
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1903 XSETBUFFER (obuf, old_buf);
20538
b964f3facafa (Fmake_indirect_buffer): Use set_marker_both.
Richard M. Stallman <rms@gnu.org>
parents: 20368
diff changeset
1904 set_marker_both (old_buf->zv_marker, obuf,
b964f3facafa (Fmake_indirect_buffer): Use set_marker_both.
Richard M. Stallman <rms@gnu.org>
parents: 20368
diff changeset
1905 BUF_ZV (old_buf), BUF_ZV_BYTE (old_buf));
10314
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1906 }
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1907 }
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1908
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1909 /* 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
1910 when it is not current, fetch them now. */
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1911 if (! NILP (b->pt_marker))
20538
b964f3facafa (Fmake_indirect_buffer): Use set_marker_both.
Richard M. Stallman <rms@gnu.org>
parents: 20368
diff changeset
1912 {
b964f3facafa (Fmake_indirect_buffer): Use set_marker_both.
Richard M. Stallman <rms@gnu.org>
parents: 20368
diff changeset
1913 BUF_PT (b) = marker_position (b->pt_marker);
b964f3facafa (Fmake_indirect_buffer): Use set_marker_both.
Richard M. Stallman <rms@gnu.org>
parents: 20368
diff changeset
1914 BUF_PT_BYTE (b) = marker_byte_position (b->pt_marker);
b964f3facafa (Fmake_indirect_buffer): Use set_marker_both.
Richard M. Stallman <rms@gnu.org>
parents: 20368
diff changeset
1915 }
10314
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1916 if (! NILP (b->begv_marker))
20538
b964f3facafa (Fmake_indirect_buffer): Use set_marker_both.
Richard M. Stallman <rms@gnu.org>
parents: 20368
diff changeset
1917 {
b964f3facafa (Fmake_indirect_buffer): Use set_marker_both.
Richard M. Stallman <rms@gnu.org>
parents: 20368
diff changeset
1918 BUF_BEGV (b) = marker_position (b->begv_marker);
b964f3facafa (Fmake_indirect_buffer): Use set_marker_both.
Richard M. Stallman <rms@gnu.org>
parents: 20368
diff changeset
1919 BUF_BEGV_BYTE (b) = marker_byte_position (b->begv_marker);
b964f3facafa (Fmake_indirect_buffer): Use set_marker_both.
Richard M. Stallman <rms@gnu.org>
parents: 20368
diff changeset
1920 }
10314
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1921 if (! NILP (b->zv_marker))
20538
b964f3facafa (Fmake_indirect_buffer): Use set_marker_both.
Richard M. Stallman <rms@gnu.org>
parents: 20368
diff changeset
1922 {
b964f3facafa (Fmake_indirect_buffer): Use set_marker_both.
Richard M. Stallman <rms@gnu.org>
parents: 20368
diff changeset
1923 BUF_ZV (b) = marker_position (b->zv_marker);
b964f3facafa (Fmake_indirect_buffer): Use set_marker_both.
Richard M. Stallman <rms@gnu.org>
parents: 20368
diff changeset
1924 BUF_ZV_BYTE (b) = marker_byte_position (b->zv_marker);
b964f3facafa (Fmake_indirect_buffer): Use set_marker_both.
Richard M. Stallman <rms@gnu.org>
parents: 20368
diff changeset
1925 }
10314
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1926 }
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1927
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1928 DEFUN ("set-buffer", Fset_buffer, Sset_buffer, 1, 1, 0,
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39974
diff changeset
1929 doc: /* Make the buffer BUFFER current for editing operations.
39971
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
1930 BUFFER may be a buffer or the name of an existing buffer.
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
1931 See also `save-excursion' when you want to make a buffer current temporarily.
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
1932 This function does not display the buffer, so its effect ends
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
1933 when the current command terminates.
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39974
diff changeset
1934 Use `switch-to-buffer' or `pop-to-buffer' to switch buffers permanently. */)
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39974
diff changeset
1935 (buffer)
13762
71c14edf7d6d (Fkill_buffer): Rename arg bufname to buffer.
Karl Heuer <kwzh@gnu.org>
parents: 13446
diff changeset
1936 register Lisp_Object buffer;
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1937 {
13762
71c14edf7d6d (Fkill_buffer): Rename arg bufname to buffer.
Karl Heuer <kwzh@gnu.org>
parents: 13446
diff changeset
1938 register Lisp_Object buf;
71c14edf7d6d (Fkill_buffer): Rename arg bufname to buffer.
Karl Heuer <kwzh@gnu.org>
parents: 13446
diff changeset
1939 buf = Fget_buffer (buffer);
71c14edf7d6d (Fkill_buffer): Rename arg bufname to buffer.
Karl Heuer <kwzh@gnu.org>
parents: 13446
diff changeset
1940 if (NILP (buf))
71c14edf7d6d (Fkill_buffer): Rename arg bufname to buffer.
Karl Heuer <kwzh@gnu.org>
parents: 13446
diff changeset
1941 nsberror (buffer);
71c14edf7d6d (Fkill_buffer): Rename arg bufname to buffer.
Karl Heuer <kwzh@gnu.org>
parents: 13446
diff changeset
1942 if (NILP (XBUFFER (buf)->name))
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1943 error ("Selecting deleted buffer");
13762
71c14edf7d6d (Fkill_buffer): Rename arg bufname to buffer.
Karl Heuer <kwzh@gnu.org>
parents: 13446
diff changeset
1944 set_buffer_internal (XBUFFER (buf));
71c14edf7d6d (Fkill_buffer): Rename arg bufname to buffer.
Karl Heuer <kwzh@gnu.org>
parents: 13446
diff changeset
1945 return buf;
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1946 }
20698
ec08780e4c42 (set_buffer_if_live): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20679
diff changeset
1947
ec08780e4c42 (set_buffer_if_live): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20679
diff changeset
1948 /* Set the current buffer to BUFFER provided it is alive. */
ec08780e4c42 (set_buffer_if_live): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20679
diff changeset
1949
ec08780e4c42 (set_buffer_if_live): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20679
diff changeset
1950 Lisp_Object
ec08780e4c42 (set_buffer_if_live): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20679
diff changeset
1951 set_buffer_if_live (buffer)
ec08780e4c42 (set_buffer_if_live): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20679
diff changeset
1952 Lisp_Object buffer;
ec08780e4c42 (set_buffer_if_live): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20679
diff changeset
1953 {
ec08780e4c42 (set_buffer_if_live): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20679
diff changeset
1954 if (! NILP (XBUFFER (buffer)->name))
ec08780e4c42 (set_buffer_if_live): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20679
diff changeset
1955 Fset_buffer (buffer);
ec08780e4c42 (set_buffer_if_live): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20679
diff changeset
1956 return Qnil;
ec08780e4c42 (set_buffer_if_live): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20679
diff changeset
1957 }
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1958
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1959 DEFUN ("barf-if-buffer-read-only", Fbarf_if_buffer_read_only,
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1960 Sbarf_if_buffer_read_only, 0, 0, 0,
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39974
diff changeset
1961 doc: /* Signal a `buffer-read-only' error if the current buffer is read-only. */)
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39974
diff changeset
1962 ()
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1963 {
3481
56424e6245c2 (syms_of_buffer): Set up Lisp var inhibit-read-only.
Richard M. Stallman <rms@gnu.org>
parents: 3463
diff changeset
1964 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
1965 && NILP (Vinhibit_read_only))
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1966 Fsignal (Qbuffer_read_only, (Fcons (Fcurrent_buffer (), Qnil)));
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1967 return Qnil;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1968 }
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1969
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1970 DEFUN ("bury-buffer", Fbury_buffer, Sbury_buffer, 0, 1, "",
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39974
diff changeset
1971 doc: /* Put BUFFER at the end of the list of all buffers.
39971
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
1972 There it is the least likely candidate for `other-buffer' to return;
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
1973 thus, the least likely buffer for \\[switch-to-buffer] to select by default.
59891
0e1b2e676d71 (Fbury_buffer): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 59833
diff changeset
1974 You can specify a buffer name as BUFFER, or an actual buffer object.
39971
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
1975 If BUFFER is nil or omitted, bury the current buffer.
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
1976 Also, if BUFFER is nil or omitted, remove the current buffer from the
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39974
diff changeset
1977 selected window if it is displayed there. */)
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39974
diff changeset
1978 (buffer)
14060
b62397f49a24 (Fmake_indirect_buffer, Fset_buffer_major_mode, Fpop_to_buffer,
Erik Naggum <erik@naggum.no>
parents: 13922
diff changeset
1979 register Lisp_Object buffer;
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1980 {
1252
86a17674c2a1 * buffer.c (Fbury_buffer): This used to undisplay the buffer being
Jim Blandy <jimb@redhat.com>
parents: 1195
diff changeset
1981 /* 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
1982 if (NILP (buffer))
1586
f84e400808d0 * buffer.c (Ferase_buffer): Doc fix.
Jim Blandy <jimb@redhat.com>
parents: 1563
diff changeset
1983 {
39802
efbac46c874c (Fbury_buffer): Don't try to remove the buffer from the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39748
diff changeset
1984 Lisp_Object tem;
14060
b62397f49a24 (Fmake_indirect_buffer, Fset_buffer_major_mode, Fpop_to_buffer,
Erik Naggum <erik@naggum.no>
parents: 13922
diff changeset
1985 XSETBUFFER (buffer, current_buffer);
18485
d6e8b92585e9 (Fbury_buffer): Undo previous change.
Richard M. Stallman <rms@gnu.org>
parents: 18455
diff changeset
1986
39802
efbac46c874c (Fbury_buffer): Don't try to remove the buffer from the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39748
diff changeset
1987 tem = Fwindow_buffer (selected_window);
18485
d6e8b92585e9 (Fbury_buffer): Undo previous change.
Richard M. Stallman <rms@gnu.org>
parents: 18455
diff changeset
1988 /* If we're burying the current buffer, unshow it. */
39802
efbac46c874c (Fbury_buffer): Don't try to remove the buffer from the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39748
diff changeset
1989 if (EQ (buffer, tem))
40840
2b65fb0dbd2d (Fbury_buffer): Use braces to follow GNU Coding Standards.
Pavel Janík <Pavel@Janik.cz>
parents: 40760
diff changeset
1990 {
2b65fb0dbd2d (Fbury_buffer): Use braces to follow GNU Coding Standards.
Pavel Janík <Pavel@Janik.cz>
parents: 40760
diff changeset
1991 if (NILP (Fwindow_dedicated_p (selected_window)))
2b65fb0dbd2d (Fbury_buffer): Use braces to follow GNU Coding Standards.
Pavel Janík <Pavel@Janik.cz>
parents: 40760
diff changeset
1992 Fswitch_to_buffer (Fother_buffer (buffer, Qnil, Qnil), Qnil);
2b65fb0dbd2d (Fbury_buffer): Use braces to follow GNU Coding Standards.
Pavel Janík <Pavel@Janik.cz>
parents: 40760
diff changeset
1993 else if (NILP (XWINDOW (selected_window)->parent))
2b65fb0dbd2d (Fbury_buffer): Use braces to follow GNU Coding Standards.
Pavel Janík <Pavel@Janik.cz>
parents: 40760
diff changeset
1994 Ficonify_frame (Fwindow_frame (selected_window));
2b65fb0dbd2d (Fbury_buffer): Use braces to follow GNU Coding Standards.
Pavel Janík <Pavel@Janik.cz>
parents: 40760
diff changeset
1995 else
2b65fb0dbd2d (Fbury_buffer): Use braces to follow GNU Coding Standards.
Pavel Janík <Pavel@Janik.cz>
parents: 40760
diff changeset
1996 Fdelete_window (selected_window);
2b65fb0dbd2d (Fbury_buffer): Use braces to follow GNU Coding Standards.
Pavel Janík <Pavel@Janik.cz>
parents: 40760
diff changeset
1997 }
1586
f84e400808d0 * buffer.c (Ferase_buffer): Doc fix.
Jim Blandy <jimb@redhat.com>
parents: 1563
diff changeset
1998 }
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1999 else
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
2000 {
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
2001 Lisp_Object buf1;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49444
diff changeset
2002
14060
b62397f49a24 (Fmake_indirect_buffer, Fset_buffer_major_mode, Fpop_to_buffer,
Erik Naggum <erik@naggum.no>
parents: 13922
diff changeset
2003 buf1 = Fget_buffer (buffer);
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 392
diff changeset
2004 if (NILP (buf1))
14060
b62397f49a24 (Fmake_indirect_buffer, Fset_buffer_major_mode, Fpop_to_buffer,
Erik Naggum <erik@naggum.no>
parents: 13922
diff changeset
2005 nsberror (buffer);
b62397f49a24 (Fmake_indirect_buffer, Fset_buffer_major_mode, Fpop_to_buffer,
Erik Naggum <erik@naggum.no>
parents: 13922
diff changeset
2006 buffer = buf1;
1252
86a17674c2a1 * buffer.c (Fbury_buffer): This used to undisplay the buffer being
Jim Blandy <jimb@redhat.com>
parents: 1195
diff changeset
2007 }
86a17674c2a1 * buffer.c (Fbury_buffer): This used to undisplay the buffer being
Jim Blandy <jimb@redhat.com>
parents: 1195
diff changeset
2008
28991
f8bcf3bec2a6 (Fbury_buffer): Avoid trouble from burying a killed buffer.
Gerd Moellmann <gerd@gnu.org>
parents: 28878
diff changeset
2009 /* Move buffer to the end of the buffer list. Do nothing if the
f8bcf3bec2a6 (Fbury_buffer): Avoid trouble from burying a killed buffer.
Gerd Moellmann <gerd@gnu.org>
parents: 28878
diff changeset
2010 buffer is killed. */
f8bcf3bec2a6 (Fbury_buffer): Avoid trouble from burying a killed buffer.
Gerd Moellmann <gerd@gnu.org>
parents: 28878
diff changeset
2011 if (!NILP (XBUFFER (buffer)->name))
f8bcf3bec2a6 (Fbury_buffer): Avoid trouble from burying a killed buffer.
Gerd Moellmann <gerd@gnu.org>
parents: 28878
diff changeset
2012 {
f8bcf3bec2a6 (Fbury_buffer): Avoid trouble from burying a killed buffer.
Gerd Moellmann <gerd@gnu.org>
parents: 28878
diff changeset
2013 Lisp_Object aelt, link;
f8bcf3bec2a6 (Fbury_buffer): Avoid trouble from burying a killed buffer.
Gerd Moellmann <gerd@gnu.org>
parents: 28878
diff changeset
2014
f8bcf3bec2a6 (Fbury_buffer): Avoid trouble from burying a killed buffer.
Gerd Moellmann <gerd@gnu.org>
parents: 28878
diff changeset
2015 aelt = Frassq (buffer, Vbuffer_alist);
f8bcf3bec2a6 (Fbury_buffer): Avoid trouble from burying a killed buffer.
Gerd Moellmann <gerd@gnu.org>
parents: 28878
diff changeset
2016 link = Fmemq (aelt, Vbuffer_alist);
f8bcf3bec2a6 (Fbury_buffer): Avoid trouble from burying a killed buffer.
Gerd Moellmann <gerd@gnu.org>
parents: 28878
diff changeset
2017 Vbuffer_alist = Fdelq (aelt, Vbuffer_alist);
39973
579177964efa Avoid (most) uses of XCAR/XCDR as lvalues, for flexibility in experimenting
Ken Raeburn <raeburn@raeburn.org>
parents: 39971
diff changeset
2018 XSETCDR (link, Qnil);
28991
f8bcf3bec2a6 (Fbury_buffer): Avoid trouble from burying a killed buffer.
Gerd Moellmann <gerd@gnu.org>
parents: 28878
diff changeset
2019 Vbuffer_alist = nconc2 (Vbuffer_alist, link);
f8bcf3bec2a6 (Fbury_buffer): Avoid trouble from burying a killed buffer.
Gerd Moellmann <gerd@gnu.org>
parents: 28878
diff changeset
2020
46016
3ba98b59cb49 (Fbury_buffer): Use frames_discard_buffer.
Richard M. Stallman <rms@gnu.org>
parents: 45683
diff changeset
2021 /* Removing BUFFER from frame-specific lists
3ba98b59cb49 (Fbury_buffer): Use frames_discard_buffer.
Richard M. Stallman <rms@gnu.org>
parents: 45683
diff changeset
2022 has the effect of putting BUFFER at the end
3ba98b59cb49 (Fbury_buffer): Use frames_discard_buffer.
Richard M. Stallman <rms@gnu.org>
parents: 45683
diff changeset
2023 of the combined list in each frame. */
3ba98b59cb49 (Fbury_buffer): Use frames_discard_buffer.
Richard M. Stallman <rms@gnu.org>
parents: 45683
diff changeset
2024 frames_discard_buffer (buffer);
28991
f8bcf3bec2a6 (Fbury_buffer): Avoid trouble from burying a killed buffer.
Gerd Moellmann <gerd@gnu.org>
parents: 28878
diff changeset
2025 }
17234
bda734eef575 (Fbury_buffer): Call frames_bury_buffer.
Richard M. Stallman <rms@gnu.org>
parents: 17220
diff changeset
2026
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
2027 return Qnil;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
2028 }
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
2029
1953
714df59790af (Ferase_buffer): Added interactive spec.
Roland McGrath <roland@gnu.org>
parents: 1952
diff changeset
2030 DEFUN ("erase-buffer", Ferase_buffer, Serase_buffer, 0, 0, "*",
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39974
diff changeset
2031 doc: /* Delete the entire contents of the current buffer.
39971
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
2032 Any narrowing restriction in effect (see `narrow-to-region') is removed,
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39974
diff changeset
2033 so the buffer is truly empty after this. */)
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39974
diff changeset
2034 ()
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
2035 {
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
2036 Fwiden ();
26056
9c4556ef15de (Fget_buffer_create, Fmake_indirect_buffer, Fkill_buffer):
Gerd Moellmann <gerd@gnu.org>
parents: 25744
diff changeset
2037
9c4556ef15de (Fget_buffer_create, Fmake_indirect_buffer, Fkill_buffer):
Gerd Moellmann <gerd@gnu.org>
parents: 25744
diff changeset
2038 del_range (BEG, Z);
25626
acfb741e6e24 (Ferase_buffer): Don't erase the minibuffer prompt.
Richard M. Stallman <rms@gnu.org>
parents: 25546
diff changeset
2039
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
2040 current_buffer->last_window_start = 1;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
2041 /* Prevent warnings, or suspension of auto saving, that would happen
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
2042 if future size is less than past size. Use of erase-buffer
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
2043 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
2044 XSETFASTINT (current_buffer->save_length, 0);
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
2045 return Qnil;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
2046 }
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
2047
20368
9f5fab56f4b3 (nsberror, record_buffer, validate_region,
Kenichi Handa <handa@m17n.org>
parents: 20186
diff changeset
2048 void
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
2049 validate_region (b, e)
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
2050 register Lisp_Object *b, *e;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
2051 {
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40605
diff changeset
2052 CHECK_NUMBER_COERCE_MARKER (*b);
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40605
diff changeset
2053 CHECK_NUMBER_COERCE_MARKER (*e);
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
2054
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
2055 if (XINT (*b) > XINT (*e))
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
2056 {
9335
8cf58b38d244 (validate_region): Swap using temp Lisp_Object, not int.
Karl Heuer <kwzh@gnu.org>
parents: 9296
diff changeset
2057 Lisp_Object tem;
8cf58b38d244 (validate_region): Swap using temp Lisp_Object, not int.
Karl Heuer <kwzh@gnu.org>
parents: 9296
diff changeset
2058 tem = *b; *b = *e; *e = tem;
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
2059 }
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
2060
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
2061 if (!(BEGV <= XINT (*b) && XINT (*b) <= XINT (*e)
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
2062 && XINT (*e) <= ZV))
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
2063 args_out_of_range (*b, *e);
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
2064 }
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
2065
20868
83f23c9f7c4d (advance_to_char_boundary): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20853
diff changeset
2066 /* Advance BYTE_POS up to a character boundary
83f23c9f7c4d (advance_to_char_boundary): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20853
diff changeset
2067 and return the adjusted position. */
83f23c9f7c4d (advance_to_char_boundary): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20853
diff changeset
2068
83f23c9f7c4d (advance_to_char_boundary): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20853
diff changeset
2069 static int
83f23c9f7c4d (advance_to_char_boundary): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20853
diff changeset
2070 advance_to_char_boundary (byte_pos)
83f23c9f7c4d (advance_to_char_boundary): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20853
diff changeset
2071 int byte_pos;
83f23c9f7c4d (advance_to_char_boundary): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20853
diff changeset
2072 {
21085
6b0336de5fbe (advance_to_char_boundary): Handle the case the code
Richard M. Stallman <rms@gnu.org>
parents: 21065
diff changeset
2073 int c;
6b0336de5fbe (advance_to_char_boundary): Handle the case the code
Richard M. Stallman <rms@gnu.org>
parents: 21065
diff changeset
2074
6b0336de5fbe (advance_to_char_boundary): Handle the case the code
Richard M. Stallman <rms@gnu.org>
parents: 21065
diff changeset
2075 if (byte_pos == BEG)
6b0336de5fbe (advance_to_char_boundary): Handle the case the code
Richard M. Stallman <rms@gnu.org>
parents: 21065
diff changeset
2076 /* Beginning of buffer is always a character boundary. */
47972
287494c5e770 (assoc_ignore_text_properties, Fother_buffer, Fkill_buffer)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 46920
diff changeset
2077 return BEG;
21085
6b0336de5fbe (advance_to_char_boundary): Handle the case the code
Richard M. Stallman <rms@gnu.org>
parents: 21065
diff changeset
2078
6b0336de5fbe (advance_to_char_boundary): Handle the case the code
Richard M. Stallman <rms@gnu.org>
parents: 21065
diff changeset
2079 c = FETCH_BYTE (byte_pos);
6b0336de5fbe (advance_to_char_boundary): Handle the case the code
Richard M. Stallman <rms@gnu.org>
parents: 21065
diff changeset
2080 if (! CHAR_HEAD_P (c))
20868
83f23c9f7c4d (advance_to_char_boundary): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20853
diff changeset
2081 {
25508
b65b5bdae65a Type in comment fixed.
Kenichi Handa <handa@m17n.org>
parents: 25491
diff changeset
2082 /* We should advance BYTE_POS only when C is a constituent of a
21085
6b0336de5fbe (advance_to_char_boundary): Handle the case the code
Richard M. Stallman <rms@gnu.org>
parents: 21065
diff changeset
2083 multibyte sequence. */
28998
d8c9e2f7022f (advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents: 28991
diff changeset
2084 int orig_byte_pos = byte_pos;
d8c9e2f7022f (advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents: 28991
diff changeset
2085
d8c9e2f7022f (advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents: 28991
diff changeset
2086 do
d8c9e2f7022f (advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents: 28991
diff changeset
2087 {
d8c9e2f7022f (advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents: 28991
diff changeset
2088 byte_pos--;
d8c9e2f7022f (advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents: 28991
diff changeset
2089 c = FETCH_BYTE (byte_pos);
d8c9e2f7022f (advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents: 28991
diff changeset
2090 }
d8c9e2f7022f (advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents: 28991
diff changeset
2091 while (! CHAR_HEAD_P (c) && byte_pos > BEG);
21085
6b0336de5fbe (advance_to_char_boundary): Handle the case the code
Richard M. Stallman <rms@gnu.org>
parents: 21065
diff changeset
2092 INC_POS (byte_pos);
28998
d8c9e2f7022f (advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents: 28991
diff changeset
2093 if (byte_pos < orig_byte_pos)
d8c9e2f7022f (advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents: 28991
diff changeset
2094 byte_pos = orig_byte_pos;
21085
6b0336de5fbe (advance_to_char_boundary): Handle the case the code
Richard M. Stallman <rms@gnu.org>
parents: 21065
diff changeset
2095 /* If C is a constituent of a multibyte sequence, BYTE_POS was
6b0336de5fbe (advance_to_char_boundary): Handle the case the code
Richard M. Stallman <rms@gnu.org>
parents: 21065
diff changeset
2096 surely advance to the correct character boundary. If C is
6b0336de5fbe (advance_to_char_boundary): Handle the case the code
Richard M. Stallman <rms@gnu.org>
parents: 21065
diff changeset
2097 not, BYTE_POS was unchanged. */
20868
83f23c9f7c4d (advance_to_char_boundary): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20853
diff changeset
2098 }
83f23c9f7c4d (advance_to_char_boundary): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20853
diff changeset
2099
20935
2fc5eb0799fe (advance_to_char_boundary): Make the behaviour
Kenichi Handa <handa@m17n.org>
parents: 20868
diff changeset
2100 return byte_pos;
20868
83f23c9f7c4d (advance_to_char_boundary): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20853
diff changeset
2101 }
83f23c9f7c4d (advance_to_char_boundary): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20853
diff changeset
2102
20679
a9d566444dd4 (Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20586
diff changeset
2103 DEFUN ("set-buffer-multibyte", Fset_buffer_multibyte, Sset_buffer_multibyte,
a9d566444dd4 (Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20586
diff changeset
2104 1, 1, 0,
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39974
diff changeset
2105 doc: /* Set the multibyte flag of the current buffer to FLAG.
39971
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
2106 If FLAG is t, this makes the buffer a multibyte buffer.
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
2107 If FLAG is nil, this makes the buffer a single-byte buffer.
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
2108 The buffer contents remain unchanged as a sequence of bytes
53815
004f4b57ea3f (Fset_buffer_multibyte): Fix docstring.
Kenichi Handa <handa@m17n.org>
parents: 53655
diff changeset
2109 but the contents viewed as characters do change.
53816
0987c11386f1 (Fset_buffer_multibyte): Fix docstring.
Kenichi Handa <handa@m17n.org>
parents: 53815
diff changeset
2110 If the multibyte flag was really changed, undo information of the
53815
004f4b57ea3f (Fset_buffer_multibyte): Fix docstring.
Kenichi Handa <handa@m17n.org>
parents: 53655
diff changeset
2111 current buffer is cleared. */)
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39974
diff changeset
2112 (flag)
20679
a9d566444dd4 (Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20586
diff changeset
2113 Lisp_Object flag;
a9d566444dd4 (Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20586
diff changeset
2114 {
51669
f3dc77591fe2 (set_buffer_internal_1): Test CONSP for lists.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51431
diff changeset
2115 struct Lisp_Marker *tail, *markers;
24604
a9eb0deae6c0 (Fmake_indirect_buffer): Copy multibyte status from the base buffer.
Richard M. Stallman <rms@gnu.org>
parents: 24520
diff changeset
2116 struct buffer *other;
28998
d8c9e2f7022f (advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents: 28991
diff changeset
2117 int undo_enabled_p = !EQ (current_buffer->undo_list, Qt);
51391
61ea5c492ffb (Fset_buffer_multibyte): Correctly recover a narrowed
Kenichi Handa <handa@m17n.org>
parents: 51318
diff changeset
2118 int begv, zv;
51394
d1641e2dfc5b (Fset_buffer_multibyte): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents: 51391
diff changeset
2119 int narrowed = (BEG != BEGV || Z != ZV);
29456
1aa0c1122f75 (Fset_buffer_multibyte): Don't make the current buffer as modified if
Kenichi Handa <handa@m17n.org>
parents: 29380
diff changeset
2120 int modified_p = !NILP (Fbuffer_modified_p (Qnil));
20679
a9d566444dd4 (Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20586
diff changeset
2121
24240
6ea9058180ec (Fset_buffer_multibyte): Error if buffer is multibyte.
Richard M. Stallman <rms@gnu.org>
parents: 23760
diff changeset
2122 if (current_buffer->base_buffer)
6ea9058180ec (Fset_buffer_multibyte): Error if buffer is multibyte.
Richard M. Stallman <rms@gnu.org>
parents: 23760
diff changeset
2123 error ("Cannot do `set-buffer-multibyte' on an indirect buffer");
6ea9058180ec (Fset_buffer_multibyte): Error if buffer is multibyte.
Richard M. Stallman <rms@gnu.org>
parents: 23760
diff changeset
2124
21506
a44f9f59c656 (Fset_buffer_multibyte): Do nothing if nothing actually
Andreas Schwab <schwab@suse.de>
parents: 21244
diff changeset
2125 /* Do nothing if nothing actually changes. */
a44f9f59c656 (Fset_buffer_multibyte): Do nothing if nothing actually
Andreas Schwab <schwab@suse.de>
parents: 21244
diff changeset
2126 if (NILP (flag) == NILP (current_buffer->enable_multibyte_characters))
a44f9f59c656 (Fset_buffer_multibyte): Do nothing if nothing actually
Andreas Schwab <schwab@suse.de>
parents: 21244
diff changeset
2127 return flag;
a44f9f59c656 (Fset_buffer_multibyte): Do nothing if nothing actually
Andreas Schwab <schwab@suse.de>
parents: 21244
diff changeset
2128
20868
83f23c9f7c4d (advance_to_char_boundary): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20853
diff changeset
2129 /* It would be better to update the list,
83f23c9f7c4d (advance_to_char_boundary): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20853
diff changeset
2130 but this is good enough for now. */
28998
d8c9e2f7022f (advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents: 28991
diff changeset
2131 if (undo_enabled_p)
d8c9e2f7022f (advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents: 28991
diff changeset
2132 current_buffer->undo_list = Qt;
20868
83f23c9f7c4d (advance_to_char_boundary): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20853
diff changeset
2133
20679
a9d566444dd4 (Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20586
diff changeset
2134 /* If the cached position is for this buffer, clear it out. */
a9d566444dd4 (Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20586
diff changeset
2135 clear_charpos_cache (current_buffer);
a9d566444dd4 (Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20586
diff changeset
2136
51391
61ea5c492ffb (Fset_buffer_multibyte): Correctly recover a narrowed
Kenichi Handa <handa@m17n.org>
parents: 51318
diff changeset
2137 if (NILP (flag))
61ea5c492ffb (Fset_buffer_multibyte): Correctly recover a narrowed
Kenichi Handa <handa@m17n.org>
parents: 51318
diff changeset
2138 begv = BEGV_BYTE, zv = ZV_BYTE;
61ea5c492ffb (Fset_buffer_multibyte): Correctly recover a narrowed
Kenichi Handa <handa@m17n.org>
parents: 51318
diff changeset
2139 else
61ea5c492ffb (Fset_buffer_multibyte): Correctly recover a narrowed
Kenichi Handa <handa@m17n.org>
parents: 51318
diff changeset
2140 begv = BEGV, zv = ZV;
61ea5c492ffb (Fset_buffer_multibyte): Correctly recover a narrowed
Kenichi Handa <handa@m17n.org>
parents: 51318
diff changeset
2141
28998
d8c9e2f7022f (advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents: 28991
diff changeset
2142 if (narrowed)
d8c9e2f7022f (advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents: 28991
diff changeset
2143 Fwiden ();
d8c9e2f7022f (advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents: 28991
diff changeset
2144
20679
a9d566444dd4 (Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20586
diff changeset
2145 if (NILP (flag))
a9d566444dd4 (Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20586
diff changeset
2146 {
28998
d8c9e2f7022f (advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents: 28991
diff changeset
2147 int pos, stop;
d8c9e2f7022f (advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents: 28991
diff changeset
2148 unsigned char *p;
d8c9e2f7022f (advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents: 28991
diff changeset
2149
20679
a9d566444dd4 (Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20586
diff changeset
2150 /* Do this first, so it can use CHAR_TO_BYTE
a9d566444dd4 (Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20586
diff changeset
2151 to calculate the old correspondences. */
a9d566444dd4 (Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20586
diff changeset
2152 set_intervals_multibyte (0);
a9d566444dd4 (Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20586
diff changeset
2153
a9d566444dd4 (Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20586
diff changeset
2154 current_buffer->enable_multibyte_characters = Qnil;
a9d566444dd4 (Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20586
diff changeset
2155
a9d566444dd4 (Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20586
diff changeset
2156 Z = Z_BYTE;
a9d566444dd4 (Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20586
diff changeset
2157 BEGV = BEGV_BYTE;
a9d566444dd4 (Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20586
diff changeset
2158 ZV = ZV_BYTE;
a9d566444dd4 (Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20586
diff changeset
2159 GPT = GPT_BYTE;
a9d566444dd4 (Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20586
diff changeset
2160 TEMP_SET_PT_BOTH (PT_BYTE, PT_BYTE);
a9d566444dd4 (Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20586
diff changeset
2161
55242
d57364949309 (syms_of_buffer) <line-spacing>: Allow float value.
Kim F. Storm <storm@cua.dk>
parents: 55140
diff changeset
2162
51669
f3dc77591fe2 (set_buffer_internal_1): Test CONSP for lists.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51431
diff changeset
2163 for (tail = BUF_MARKERS (current_buffer); tail; tail = tail->next)
f3dc77591fe2 (set_buffer_internal_1): Test CONSP for lists.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51431
diff changeset
2164 tail->charpos = tail->bytepos;
28998
d8c9e2f7022f (advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents: 28991
diff changeset
2165
d8c9e2f7022f (advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents: 28991
diff changeset
2166 /* Convert multibyte form of 8-bit characters to unibyte. */
d8c9e2f7022f (advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents: 28991
diff changeset
2167 pos = BEG;
d8c9e2f7022f (advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents: 28991
diff changeset
2168 stop = GPT;
d8c9e2f7022f (advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents: 28991
diff changeset
2169 p = BEG_ADDR;
d8c9e2f7022f (advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents: 28991
diff changeset
2170 while (1)
d8c9e2f7022f (advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents: 28991
diff changeset
2171 {
d8c9e2f7022f (advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents: 28991
diff changeset
2172 int c, bytes;
d8c9e2f7022f (advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents: 28991
diff changeset
2173
d8c9e2f7022f (advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents: 28991
diff changeset
2174 if (pos == stop)
d8c9e2f7022f (advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents: 28991
diff changeset
2175 {
d8c9e2f7022f (advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents: 28991
diff changeset
2176 if (pos == Z)
d8c9e2f7022f (advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents: 28991
diff changeset
2177 break;
d8c9e2f7022f (advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents: 28991
diff changeset
2178 p = GAP_END_ADDR;
d8c9e2f7022f (advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents: 28991
diff changeset
2179 stop = Z;
d8c9e2f7022f (advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents: 28991
diff changeset
2180 }
d8c9e2f7022f (advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents: 28991
diff changeset
2181 if (MULTIBYTE_STR_AS_UNIBYTE_P (p, bytes))
d8c9e2f7022f (advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents: 28991
diff changeset
2182 p += bytes, pos += bytes;
d8c9e2f7022f (advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents: 28991
diff changeset
2183 else
d8c9e2f7022f (advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents: 28991
diff changeset
2184 {
d8c9e2f7022f (advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents: 28991
diff changeset
2185 c = STRING_CHAR (p, stop - pos);
d8c9e2f7022f (advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents: 28991
diff changeset
2186 /* Delete all bytes for this 8-bit character but the
d8c9e2f7022f (advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents: 28991
diff changeset
2187 last one, and change the last one to the charcter
d8c9e2f7022f (advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents: 28991
diff changeset
2188 code. */
d8c9e2f7022f (advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents: 28991
diff changeset
2189 bytes--;
d8c9e2f7022f (advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents: 28991
diff changeset
2190 del_range_2 (pos, pos, pos + bytes, pos + bytes, 0);
d8c9e2f7022f (advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents: 28991
diff changeset
2191 p = GAP_END_ADDR;
d8c9e2f7022f (advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents: 28991
diff changeset
2192 *p++ = c;
d8c9e2f7022f (advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents: 28991
diff changeset
2193 pos++;
d8c9e2f7022f (advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents: 28991
diff changeset
2194 if (begv > pos)
d8c9e2f7022f (advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents: 28991
diff changeset
2195 begv -= bytes;
d8c9e2f7022f (advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents: 28991
diff changeset
2196 if (zv > pos)
d8c9e2f7022f (advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents: 28991
diff changeset
2197 zv -= bytes;
d8c9e2f7022f (advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents: 28991
diff changeset
2198 stop = Z;
d8c9e2f7022f (advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents: 28991
diff changeset
2199 }
d8c9e2f7022f (advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents: 28991
diff changeset
2200 }
d8c9e2f7022f (advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents: 28991
diff changeset
2201 if (narrowed)
d8c9e2f7022f (advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents: 28991
diff changeset
2202 Fnarrow_to_region (make_number (begv), make_number (zv));
20679
a9d566444dd4 (Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20586
diff changeset
2203 }
a9d566444dd4 (Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20586
diff changeset
2204 else
a9d566444dd4 (Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20586
diff changeset
2205 {
28998
d8c9e2f7022f (advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents: 28991
diff changeset
2206 int pt = PT;
d8c9e2f7022f (advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents: 28991
diff changeset
2207 int pos, stop;
d8c9e2f7022f (advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents: 28991
diff changeset
2208 unsigned char *p;
d8c9e2f7022f (advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents: 28991
diff changeset
2209
21065
fde58556c616 (Fset_buffer_multibyte): Fix arg for chars_in_text.
Kenichi Handa <handa@m17n.org>
parents: 20995
diff changeset
2210 /* Be sure not to have a multibyte sequence striding over the GAP.
28998
d8c9e2f7022f (advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents: 28991
diff changeset
2211 Ex: We change this: "...abc\201 _GAP_ \241def..."
d8c9e2f7022f (advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents: 28991
diff changeset
2212 to: "...abc _GAP_ \201\241def..." */
21065
fde58556c616 (Fset_buffer_multibyte): Fix arg for chars_in_text.
Kenichi Handa <handa@m17n.org>
parents: 20995
diff changeset
2213
fde58556c616 (Fset_buffer_multibyte): Fix arg for chars_in_text.
Kenichi Handa <handa@m17n.org>
parents: 20995
diff changeset
2214 if (GPT_BYTE > 1 && GPT_BYTE < Z_BYTE
fde58556c616 (Fset_buffer_multibyte): Fix arg for chars_in_text.
Kenichi Handa <handa@m17n.org>
parents: 20995
diff changeset
2215 && ! CHAR_HEAD_P (*(GAP_END_ADDR)))
fde58556c616 (Fset_buffer_multibyte): Fix arg for chars_in_text.
Kenichi Handa <handa@m17n.org>
parents: 20995
diff changeset
2216 {
fde58556c616 (Fset_buffer_multibyte): Fix arg for chars_in_text.
Kenichi Handa <handa@m17n.org>
parents: 20995
diff changeset
2217 unsigned char *p = GPT_ADDR - 1;
fde58556c616 (Fset_buffer_multibyte): Fix arg for chars_in_text.
Kenichi Handa <handa@m17n.org>
parents: 20995
diff changeset
2218
fde58556c616 (Fset_buffer_multibyte): Fix arg for chars_in_text.
Kenichi Handa <handa@m17n.org>
parents: 20995
diff changeset
2219 while (! CHAR_HEAD_P (*p) && p > BEG_ADDR) p--;
fde58556c616 (Fset_buffer_multibyte): Fix arg for chars_in_text.
Kenichi Handa <handa@m17n.org>
parents: 20995
diff changeset
2220 if (BASE_LEADING_CODE_P (*p))
fde58556c616 (Fset_buffer_multibyte): Fix arg for chars_in_text.
Kenichi Handa <handa@m17n.org>
parents: 20995
diff changeset
2221 {
fde58556c616 (Fset_buffer_multibyte): Fix arg for chars_in_text.
Kenichi Handa <handa@m17n.org>
parents: 20995
diff changeset
2222 int new_gpt = GPT_BYTE - (GPT_ADDR - p);
fde58556c616 (Fset_buffer_multibyte): Fix arg for chars_in_text.
Kenichi Handa <handa@m17n.org>
parents: 20995
diff changeset
2223
fde58556c616 (Fset_buffer_multibyte): Fix arg for chars_in_text.
Kenichi Handa <handa@m17n.org>
parents: 20995
diff changeset
2224 move_gap_both (new_gpt, new_gpt);
fde58556c616 (Fset_buffer_multibyte): Fix arg for chars_in_text.
Kenichi Handa <handa@m17n.org>
parents: 20995
diff changeset
2225 }
fde58556c616 (Fset_buffer_multibyte): Fix arg for chars_in_text.
Kenichi Handa <handa@m17n.org>
parents: 20995
diff changeset
2226 }
fde58556c616 (Fset_buffer_multibyte): Fix arg for chars_in_text.
Kenichi Handa <handa@m17n.org>
parents: 20995
diff changeset
2227
28998
d8c9e2f7022f (advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents: 28991
diff changeset
2228 /* Make the buffer contents valid as multibyte by converting
d8c9e2f7022f (advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents: 28991
diff changeset
2229 8-bit characters to multibyte form. */
d8c9e2f7022f (advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents: 28991
diff changeset
2230 pos = BEG;
d8c9e2f7022f (advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents: 28991
diff changeset
2231 stop = GPT;
d8c9e2f7022f (advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents: 28991
diff changeset
2232 p = BEG_ADDR;
d8c9e2f7022f (advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents: 28991
diff changeset
2233 while (1)
d8c9e2f7022f (advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents: 28991
diff changeset
2234 {
d8c9e2f7022f (advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents: 28991
diff changeset
2235 int bytes;
d8c9e2f7022f (advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents: 28991
diff changeset
2236
d8c9e2f7022f (advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents: 28991
diff changeset
2237 if (pos == stop)
d8c9e2f7022f (advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents: 28991
diff changeset
2238 {
d8c9e2f7022f (advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents: 28991
diff changeset
2239 if (pos == Z)
d8c9e2f7022f (advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents: 28991
diff changeset
2240 break;
d8c9e2f7022f (advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents: 28991
diff changeset
2241 p = GAP_END_ADDR;
d8c9e2f7022f (advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents: 28991
diff changeset
2242 stop = Z;
d8c9e2f7022f (advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents: 28991
diff changeset
2243 }
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49444
diff changeset
2244
28998
d8c9e2f7022f (advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents: 28991
diff changeset
2245 if (UNIBYTE_STR_AS_MULTIBYTE_P (p, stop - pos, bytes))
d8c9e2f7022f (advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents: 28991
diff changeset
2246 p += bytes, pos += bytes;
d8c9e2f7022f (advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents: 28991
diff changeset
2247 else
d8c9e2f7022f (advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents: 28991
diff changeset
2248 {
d8c9e2f7022f (advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents: 28991
diff changeset
2249 unsigned char tmp[MAX_MULTIBYTE_LENGTH];
d8c9e2f7022f (advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents: 28991
diff changeset
2250
d8c9e2f7022f (advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents: 28991
diff changeset
2251 bytes = CHAR_STRING (*p, tmp);
d8c9e2f7022f (advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents: 28991
diff changeset
2252 *p = tmp[0];
d8c9e2f7022f (advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents: 28991
diff changeset
2253 TEMP_SET_PT_BOTH (pos + 1, pos + 1);
d8c9e2f7022f (advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents: 28991
diff changeset
2254 bytes--;
d8c9e2f7022f (advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents: 28991
diff changeset
2255 insert_1_both (tmp + 1, bytes, bytes, 1, 0, 0);
d8c9e2f7022f (advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents: 28991
diff changeset
2256 /* Now the gap is after the just inserted data. */
d8c9e2f7022f (advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents: 28991
diff changeset
2257 pos = GPT;
d8c9e2f7022f (advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents: 28991
diff changeset
2258 p = GAP_END_ADDR;
d8c9e2f7022f (advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents: 28991
diff changeset
2259 if (pos <= begv)
d8c9e2f7022f (advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents: 28991
diff changeset
2260 begv += bytes;
d8c9e2f7022f (advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents: 28991
diff changeset
2261 if (pos <= zv)
d8c9e2f7022f (advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents: 28991
diff changeset
2262 zv += bytes;
d8c9e2f7022f (advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents: 28991
diff changeset
2263 if (pos <= pt)
d8c9e2f7022f (advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents: 28991
diff changeset
2264 pt += bytes;
d8c9e2f7022f (advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents: 28991
diff changeset
2265 stop = Z;
d8c9e2f7022f (advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents: 28991
diff changeset
2266 }
d8c9e2f7022f (advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents: 28991
diff changeset
2267 }
d8c9e2f7022f (advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents: 28991
diff changeset
2268
d8c9e2f7022f (advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents: 28991
diff changeset
2269 if (pt != PT)
d8c9e2f7022f (advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents: 28991
diff changeset
2270 TEMP_SET_PT (pt);
d8c9e2f7022f (advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents: 28991
diff changeset
2271
d8c9e2f7022f (advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents: 28991
diff changeset
2272 if (narrowed)
d8c9e2f7022f (advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents: 28991
diff changeset
2273 Fnarrow_to_region (make_number (begv), make_number (zv));
d8c9e2f7022f (advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents: 28991
diff changeset
2274
20679
a9d566444dd4 (Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20586
diff changeset
2275 /* Do this first, so that chars_in_text asks the right question.
a9d566444dd4 (Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20586
diff changeset
2276 set_intervals_multibyte needs it too. */
a9d566444dd4 (Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20586
diff changeset
2277 current_buffer->enable_multibyte_characters = Qt;
a9d566444dd4 (Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20586
diff changeset
2278
20868
83f23c9f7c4d (advance_to_char_boundary): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20853
diff changeset
2279 GPT_BYTE = advance_to_char_boundary (GPT_BYTE);
20679
a9d566444dd4 (Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20586
diff changeset
2280 GPT = chars_in_text (BEG_ADDR, GPT_BYTE - BEG_BYTE) + BEG;
20868
83f23c9f7c4d (advance_to_char_boundary): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20853
diff changeset
2281
21065
fde58556c616 (Fset_buffer_multibyte): Fix arg for chars_in_text.
Kenichi Handa <handa@m17n.org>
parents: 20995
diff changeset
2282 Z = chars_in_text (GAP_END_ADDR, Z_BYTE - GPT_BYTE) + GPT;
20868
83f23c9f7c4d (advance_to_char_boundary): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20853
diff changeset
2283
83f23c9f7c4d (advance_to_char_boundary): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20853
diff changeset
2284 BEGV_BYTE = advance_to_char_boundary (BEGV_BYTE);
20679
a9d566444dd4 (Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20586
diff changeset
2285 if (BEGV_BYTE > GPT_BYTE)
21065
fde58556c616 (Fset_buffer_multibyte): Fix arg for chars_in_text.
Kenichi Handa <handa@m17n.org>
parents: 20995
diff changeset
2286 BEGV = chars_in_text (GAP_END_ADDR, BEGV_BYTE - GPT_BYTE) + GPT;
20679
a9d566444dd4 (Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20586
diff changeset
2287 else
a9d566444dd4 (Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20586
diff changeset
2288 BEGV = chars_in_text (BEG_ADDR, BEGV_BYTE - BEG_BYTE) + BEG;
20868
83f23c9f7c4d (advance_to_char_boundary): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20853
diff changeset
2289
83f23c9f7c4d (advance_to_char_boundary): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20853
diff changeset
2290 ZV_BYTE = advance_to_char_boundary (ZV_BYTE);
20679
a9d566444dd4 (Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20586
diff changeset
2291 if (ZV_BYTE > GPT_BYTE)
21065
fde58556c616 (Fset_buffer_multibyte): Fix arg for chars_in_text.
Kenichi Handa <handa@m17n.org>
parents: 20995
diff changeset
2292 ZV = chars_in_text (GAP_END_ADDR, ZV_BYTE - GPT_BYTE) + GPT;
20679
a9d566444dd4 (Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20586
diff changeset
2293 else
a9d566444dd4 (Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20586
diff changeset
2294 ZV = chars_in_text (BEG_ADDR, ZV_BYTE - BEG_BYTE) + BEG;
20868
83f23c9f7c4d (advance_to_char_boundary): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20853
diff changeset
2295
83f23c9f7c4d (advance_to_char_boundary): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20853
diff changeset
2296 {
83f23c9f7c4d (advance_to_char_boundary): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20853
diff changeset
2297 int pt_byte = advance_to_char_boundary (PT_BYTE);
83f23c9f7c4d (advance_to_char_boundary): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20853
diff changeset
2298 int pt;
83f23c9f7c4d (advance_to_char_boundary): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20853
diff changeset
2299
83f23c9f7c4d (advance_to_char_boundary): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20853
diff changeset
2300 if (pt_byte > GPT_BYTE)
21065
fde58556c616 (Fset_buffer_multibyte): Fix arg for chars_in_text.
Kenichi Handa <handa@m17n.org>
parents: 20995
diff changeset
2301 pt = chars_in_text (GAP_END_ADDR, pt_byte - GPT_BYTE) + GPT;
20868
83f23c9f7c4d (advance_to_char_boundary): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20853
diff changeset
2302 else
83f23c9f7c4d (advance_to_char_boundary): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20853
diff changeset
2303 pt = chars_in_text (BEG_ADDR, pt_byte - BEG_BYTE) + BEG;
83f23c9f7c4d (advance_to_char_boundary): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20853
diff changeset
2304 TEMP_SET_PT_BOTH (pt, pt_byte);
83f23c9f7c4d (advance_to_char_boundary): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20853
diff changeset
2305 }
20679
a9d566444dd4 (Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20586
diff changeset
2306
a9d566444dd4 (Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20586
diff changeset
2307 tail = markers = BUF_MARKERS (current_buffer);
22021
55fc60b09fa7 Comment change.
Richard M. Stallman <rms@gnu.org>
parents: 21969
diff changeset
2308
55fc60b09fa7 Comment change.
Richard M. Stallman <rms@gnu.org>
parents: 21969
diff changeset
2309 /* This prevents BYTE_TO_CHAR (that is, buf_bytepos_to_charpos) from
55fc60b09fa7 Comment change.
Richard M. Stallman <rms@gnu.org>
parents: 21969
diff changeset
2310 getting confused by the markers that have not yet been updated.
55fc60b09fa7 Comment change.
Richard M. Stallman <rms@gnu.org>
parents: 21969
diff changeset
2311 It is also a signal that it should never create a marker. */
51669
f3dc77591fe2 (set_buffer_internal_1): Test CONSP for lists.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51431
diff changeset
2312 BUF_MARKERS (current_buffer) = NULL;
f3dc77591fe2 (set_buffer_internal_1): Test CONSP for lists.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51431
diff changeset
2313
f3dc77591fe2 (set_buffer_internal_1): Test CONSP for lists.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51431
diff changeset
2314 for (; tail; tail = tail->next)
20679
a9d566444dd4 (Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20586
diff changeset
2315 {
51669
f3dc77591fe2 (set_buffer_internal_1): Test CONSP for lists.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51431
diff changeset
2316 tail->bytepos = advance_to_char_boundary (tail->bytepos);
f3dc77591fe2 (set_buffer_internal_1): Test CONSP for lists.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51431
diff changeset
2317 tail->charpos = BYTE_TO_CHAR (tail->bytepos);
20679
a9d566444dd4 (Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20586
diff changeset
2318 }
22023
8c00a2d112cc (Fset_buffer_multibyte): Error if marker is put
Richard M. Stallman <rms@gnu.org>
parents: 22021
diff changeset
2319
8c00a2d112cc (Fset_buffer_multibyte): Error if marker is put
Richard M. Stallman <rms@gnu.org>
parents: 22021
diff changeset
2320 /* Make sure no markers were put on the chain
8c00a2d112cc (Fset_buffer_multibyte): Error if marker is put
Richard M. Stallman <rms@gnu.org>
parents: 22021
diff changeset
2321 while the chain value was incorrect. */
51669
f3dc77591fe2 (set_buffer_internal_1): Test CONSP for lists.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51431
diff changeset
2322 if (BUF_MARKERS (current_buffer))
22023
8c00a2d112cc (Fset_buffer_multibyte): Error if marker is put
Richard M. Stallman <rms@gnu.org>
parents: 22021
diff changeset
2323 abort ();
8c00a2d112cc (Fset_buffer_multibyte): Error if marker is put
Richard M. Stallman <rms@gnu.org>
parents: 22021
diff changeset
2324
20679
a9d566444dd4 (Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20586
diff changeset
2325 BUF_MARKERS (current_buffer) = markers;
a9d566444dd4 (Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20586
diff changeset
2326
a9d566444dd4 (Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20586
diff changeset
2327 /* Do this last, so it can calculate the new correspondences
a9d566444dd4 (Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20586
diff changeset
2328 between chars and bytes. */
a9d566444dd4 (Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20586
diff changeset
2329 set_intervals_multibyte (1);
a9d566444dd4 (Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20586
diff changeset
2330 }
a9d566444dd4 (Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20586
diff changeset
2331
28998
d8c9e2f7022f (advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents: 28991
diff changeset
2332 if (undo_enabled_p)
d8c9e2f7022f (advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents: 28991
diff changeset
2333 current_buffer->undo_list = Qnil;
d8c9e2f7022f (advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents: 28991
diff changeset
2334
26970
7b3d9b3a9d69 (Fset_buffer_multibyte): Arrange for a thorough
Gerd Moellmann <gerd@gnu.org>
parents: 26555
diff changeset
2335 /* Changing the multibyteness of a buffer means that all windows
7b3d9b3a9d69 (Fset_buffer_multibyte): Arrange for a thorough
Gerd Moellmann <gerd@gnu.org>
parents: 26555
diff changeset
2336 showing that buffer must be updated thoroughly. */
7b3d9b3a9d69 (Fset_buffer_multibyte): Arrange for a thorough
Gerd Moellmann <gerd@gnu.org>
parents: 26555
diff changeset
2337 current_buffer->prevent_redisplay_optimizations_p = 1;
7b3d9b3a9d69 (Fset_buffer_multibyte): Arrange for a thorough
Gerd Moellmann <gerd@gnu.org>
parents: 26555
diff changeset
2338 ++windows_or_buffers_changed;
7b3d9b3a9d69 (Fset_buffer_multibyte): Arrange for a thorough
Gerd Moellmann <gerd@gnu.org>
parents: 26555
diff changeset
2339
24604
a9eb0deae6c0 (Fmake_indirect_buffer): Copy multibyte status from the base buffer.
Richard M. Stallman <rms@gnu.org>
parents: 24520
diff changeset
2340 /* Copy this buffer's new multibyte status
a9eb0deae6c0 (Fmake_indirect_buffer): Copy multibyte status from the base buffer.
Richard M. Stallman <rms@gnu.org>
parents: 24520
diff changeset
2341 into all of its indirect buffers. */
a9eb0deae6c0 (Fmake_indirect_buffer): Copy multibyte status from the base buffer.
Richard M. Stallman <rms@gnu.org>
parents: 24520
diff changeset
2342 for (other = all_buffers; other; other = other->next)
a9eb0deae6c0 (Fmake_indirect_buffer): Copy multibyte status from the base buffer.
Richard M. Stallman <rms@gnu.org>
parents: 24520
diff changeset
2343 if (other->base_buffer == current_buffer && !NILP (other->name))
26970
7b3d9b3a9d69 (Fset_buffer_multibyte): Arrange for a thorough
Gerd Moellmann <gerd@gnu.org>
parents: 26555
diff changeset
2344 {
7b3d9b3a9d69 (Fset_buffer_multibyte): Arrange for a thorough
Gerd Moellmann <gerd@gnu.org>
parents: 26555
diff changeset
2345 other->enable_multibyte_characters
7b3d9b3a9d69 (Fset_buffer_multibyte): Arrange for a thorough
Gerd Moellmann <gerd@gnu.org>
parents: 26555
diff changeset
2346 = current_buffer->enable_multibyte_characters;
7b3d9b3a9d69 (Fset_buffer_multibyte): Arrange for a thorough
Gerd Moellmann <gerd@gnu.org>
parents: 26555
diff changeset
2347 other->prevent_redisplay_optimizations_p = 1;
7b3d9b3a9d69 (Fset_buffer_multibyte): Arrange for a thorough
Gerd Moellmann <gerd@gnu.org>
parents: 26555
diff changeset
2348 }
24604
a9eb0deae6c0 (Fmake_indirect_buffer): Copy multibyte status from the base buffer.
Richard M. Stallman <rms@gnu.org>
parents: 24520
diff changeset
2349
29456
1aa0c1122f75 (Fset_buffer_multibyte): Don't make the current buffer as modified if
Kenichi Handa <handa@m17n.org>
parents: 29380
diff changeset
2350 /* Restore the modifiedness of the buffer. */
1aa0c1122f75 (Fset_buffer_multibyte): Don't make the current buffer as modified if
Kenichi Handa <handa@m17n.org>
parents: 29380
diff changeset
2351 if (!modified_p && !NILP (Fbuffer_modified_p (Qnil)))
1aa0c1122f75 (Fset_buffer_multibyte): Don't make the current buffer as modified if
Kenichi Handa <handa@m17n.org>
parents: 29380
diff changeset
2352 Fset_buffer_modified_p (Qnil);
1aa0c1122f75 (Fset_buffer_multibyte): Don't make the current buffer as modified if
Kenichi Handa <handa@m17n.org>
parents: 29380
diff changeset
2353
49974
3420da3e4b0f (Fset_buffer_multibyte): Pay attention to the buffer
Kenichi Handa <handa@m17n.org>
parents: 49664
diff changeset
2354 #ifdef subprocesses
49664
8bcbac2617a9 (Fset_buffer_multibyte): If the current buffer has a
Kenichi Handa <handa@m17n.org>
parents: 49600
diff changeset
2355 /* Update coding systems of this buffer's process (if any). */
8bcbac2617a9 (Fset_buffer_multibyte): If the current buffer has a
Kenichi Handa <handa@m17n.org>
parents: 49600
diff changeset
2356 {
8bcbac2617a9 (Fset_buffer_multibyte): If the current buffer has a
Kenichi Handa <handa@m17n.org>
parents: 49600
diff changeset
2357 Lisp_Object process;
8bcbac2617a9 (Fset_buffer_multibyte): If the current buffer has a
Kenichi Handa <handa@m17n.org>
parents: 49600
diff changeset
2358
8bcbac2617a9 (Fset_buffer_multibyte): If the current buffer has a
Kenichi Handa <handa@m17n.org>
parents: 49600
diff changeset
2359 process = Fget_buffer_process (Fcurrent_buffer ());
8bcbac2617a9 (Fset_buffer_multibyte): If the current buffer has a
Kenichi Handa <handa@m17n.org>
parents: 49600
diff changeset
2360 if (PROCESSP (process))
8bcbac2617a9 (Fset_buffer_multibyte): If the current buffer has a
Kenichi Handa <handa@m17n.org>
parents: 49600
diff changeset
2361 setup_process_coding_systems (process);
8bcbac2617a9 (Fset_buffer_multibyte): If the current buffer has a
Kenichi Handa <handa@m17n.org>
parents: 49600
diff changeset
2362 }
49974
3420da3e4b0f (Fset_buffer_multibyte): Pay attention to the buffer
Kenichi Handa <handa@m17n.org>
parents: 49664
diff changeset
2363 #endif /* subprocesses */
49664
8bcbac2617a9 (Fset_buffer_multibyte): If the current buffer has a
Kenichi Handa <handa@m17n.org>
parents: 49600
diff changeset
2364
20679
a9d566444dd4 (Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20586
diff changeset
2365 return flag;
a9d566444dd4 (Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20586
diff changeset
2366 }
a9d566444dd4 (Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20586
diff changeset
2367
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
2368 DEFUN ("kill-all-local-variables", Fkill_all_local_variables, Skill_all_local_variables,
40108
6084dfa5f85d Reindent DEFUNs and DEFVARs woth doc: keywords.
Pavel Janík <Pavel@Janik.cz>
parents: 39988
diff changeset
2369 0, 0, 0,
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39974
diff changeset
2370 doc: /* Switch to Fundamental mode by killing current buffer's local variables.
39971
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
2371 Most local variable bindings are eliminated so that the default values
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
2372 become effective once more. Also, the syntax table is set from
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
2373 `standard-syntax-table', the local keymap is set to nil,
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
2374 and the abbrev table from `fundamental-mode-abbrev-table'.
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
2375 This function also forces redisplay of the mode line.
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
2376
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
2377 Every function to select a new major mode starts by
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
2378 calling this function.
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
2379
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
2380 As a special exception, local variables whose names have
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
2381 a non-nil `permanent-local' property are not eliminated by this function.
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
2382
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
2383 The first thing this function does is run
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39974
diff changeset
2384 the normal hook `change-major-mode-hook'. */)
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39974
diff changeset
2385 ()
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
2386 {
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
2387 register Lisp_Object alist, sym, tem;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
2388 Lisp_Object oalist;
5873
fa8b769ef564 (Fkill_all_local_variables): Run change-major-mode-hook.
Karl Heuer <kwzh@gnu.org>
parents: 5857
diff changeset
2389
6205
88e41d7d1e27 (Fkill_buffer, Fkill_all_local_variables):
Richard M. Stallman <rms@gnu.org>
parents: 6169
diff changeset
2390 if (!NILP (Vrun_hooks))
88e41d7d1e27 (Fkill_buffer, Fkill_all_local_variables):
Richard M. Stallman <rms@gnu.org>
parents: 6169
diff changeset
2391 call1 (Vrun_hooks, intern ("change-major-mode-hook"));
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
2392 oalist = current_buffer->local_var_alist;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
2393
11214
b880572ce431 (Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents: 11112
diff changeset
2394 /* 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
2395 remain swapped in, in their symbols. */
b880572ce431 (Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents: 11112
diff changeset
2396
b880572ce431 (Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents: 11112
diff changeset
2397 swap_out_buffer_local_variables (current_buffer);
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
2398
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
2399 /* Actually eliminate all local bindings of this buffer. */
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
2400
15776
6018e01d4466 (buffer_permanent_local_flags): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 15638
diff changeset
2401 reset_buffer_local_variables (current_buffer, 0);
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
2402
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
2403 /* Any which are supposed to be permanent,
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
2404 make local again, with the same values they had. */
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49444
diff changeset
2405
26164
d39ec0a27081 more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents: 26088
diff changeset
2406 for (alist = oalist; !NILP (alist); alist = XCDR (alist))
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
2407 {
26164
d39ec0a27081 more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents: 26088
diff changeset
2408 sym = XCAR (XCAR (alist));
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
2409 tem = Fget (sym, Qpermanent_local);
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 392
diff changeset
2410 if (! NILP (tem))
392
dce611246f59 *** empty log message ***
Roland McGrath <roland@gnu.org>
parents: 333
diff changeset
2411 {
dce611246f59 *** empty log message ***
Roland McGrath <roland@gnu.org>
parents: 333
diff changeset
2412 Fmake_local_variable (sym);
26164
d39ec0a27081 more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents: 26088
diff changeset
2413 Fset (sym, XCDR (XCAR (alist)));
392
dce611246f59 *** empty log message ***
Roland McGrath <roland@gnu.org>
parents: 333
diff changeset
2414 }
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
2415 }
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
2416
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
2417 /* Force mode-line redisplay. Useful here because all major mode
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
2418 commands call this function. */
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
2419 update_mode_lines++;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
2420
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
2421 return Qnil;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
2422 }
11214
b880572ce431 (Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents: 11112
diff changeset
2423
b880572ce431 (Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents: 11112
diff changeset
2424 /* 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
2425 for their current values. */
b880572ce431 (Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents: 11112
diff changeset
2426
b880572ce431 (Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents: 11112
diff changeset
2427 static void
b880572ce431 (Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents: 11112
diff changeset
2428 swap_out_buffer_local_variables (b)
b880572ce431 (Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents: 11112
diff changeset
2429 struct buffer *b;
b880572ce431 (Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents: 11112
diff changeset
2430 {
b880572ce431 (Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents: 11112
diff changeset
2431 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
2432
b880572ce431 (Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents: 11112
diff changeset
2433 XSETBUFFER (buffer, b);
b880572ce431 (Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents: 11112
diff changeset
2434 oalist = b->local_var_alist;
b880572ce431 (Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents: 11112
diff changeset
2435
26164
d39ec0a27081 more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents: 26088
diff changeset
2436 for (alist = oalist; !NILP (alist); alist = XCDR (alist))
11214
b880572ce431 (Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents: 11112
diff changeset
2437 {
26164
d39ec0a27081 more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents: 26088
diff changeset
2438 sym = XCAR (XCAR (alist));
11214
b880572ce431 (Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents: 11112
diff changeset
2439
b880572ce431 (Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents: 11112
diff changeset
2440 /* Need not do anything if some other buffer's binding is now encached. */
39581
6d9fa06012a6 Use SYMBOL_VALUE/SET_SYMBOL_VALUE macros instead of accessing
Gerd Moellmann <gerd@gnu.org>
parents: 39337
diff changeset
2441 tem = XBUFFER_LOCAL_VALUE (SYMBOL_VALUE (sym))->buffer;
28417
4b675266db04 * lisp.h (XCONS, XSTRING, XSYMBOL, XFLOAT, XPROCESS, XWINDOW, XSUBR, XBUFFER):
Ken Raeburn <raeburn@raeburn.org>
parents: 28352
diff changeset
2442 if (BUFFERP (tem) && XBUFFER (tem) == current_buffer)
11214
b880572ce431 (Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents: 11112
diff changeset
2443 {
b880572ce431 (Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents: 11112
diff changeset
2444 /* 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
2445 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
2446
39581
6d9fa06012a6 Use SYMBOL_VALUE/SET_SYMBOL_VALUE macros instead of accessing
Gerd Moellmann <gerd@gnu.org>
parents: 39337
diff changeset
2447 tem = XBUFFER_LOCAL_VALUE (SYMBOL_VALUE (sym))->cdr;
11214
b880572ce431 (Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents: 11112
diff changeset
2448 /* 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
2449 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
2450 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
2451 later in Fkill_all_local_variables, we don't lose the value. */
39973
579177964efa Avoid (most) uses of XCAR/XCDR as lvalues, for flexibility in experimenting
Ken Raeburn <raeburn@raeburn.org>
parents: 39971
diff changeset
2452 XSETCDR (XCAR (tem),
579177964efa Avoid (most) uses of XCAR/XCDR as lvalues, for flexibility in experimenting
Ken Raeburn <raeburn@raeburn.org>
parents: 39971
diff changeset
2453 do_symval_forwarding (XBUFFER_LOCAL_VALUE (SYMBOL_VALUE (sym))->realvalue));
11214
b880572ce431 (Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents: 11112
diff changeset
2454 /* Switch to the symbol's default-value alist entry. */
39973
579177964efa Avoid (most) uses of XCAR/XCDR as lvalues, for flexibility in experimenting
Ken Raeburn <raeburn@raeburn.org>
parents: 39971
diff changeset
2455 XSETCAR (tem, tem);
11214
b880572ce431 (Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents: 11112
diff changeset
2456 /* Mark it as current for buffer B. */
39581
6d9fa06012a6 Use SYMBOL_VALUE/SET_SYMBOL_VALUE macros instead of accessing
Gerd Moellmann <gerd@gnu.org>
parents: 39337
diff changeset
2457 XBUFFER_LOCAL_VALUE (SYMBOL_VALUE (sym))->buffer = buffer;
11214
b880572ce431 (Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents: 11112
diff changeset
2458 /* Store the current value into any forwarding in the symbol. */
21141
e30cebe8ae7c (init_buffer): Call Fset_buffer_multibyte for *scratch*.
Richard M. Stallman <rms@gnu.org>
parents: 21085
diff changeset
2459 store_symval_forwarding (sym,
39581
6d9fa06012a6 Use SYMBOL_VALUE/SET_SYMBOL_VALUE macros instead of accessing
Gerd Moellmann <gerd@gnu.org>
parents: 39337
diff changeset
2460 XBUFFER_LOCAL_VALUE (SYMBOL_VALUE (sym))->realvalue,
36818
c2640df9b55b (swap_out_buffer_local_variables): Call
Gerd Moellmann <gerd@gnu.org>
parents: 36626
diff changeset
2461 XCDR (tem), NULL);
11214
b880572ce431 (Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents: 11112
diff changeset
2462 }
b880572ce431 (Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents: 11112
diff changeset
2463 }
b880572ce431 (Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents: 11112
diff changeset
2464 }
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
2465
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
2466 /* Find all the overlays in the current buffer that contain position POS.
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49444
diff changeset
2467 Return the number found, and store them in a vector in *VEC_PTR.
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
2468 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
2469 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
2470 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
2471 Store in *PREV_PTR the previous position before POS where an overlay ends,
25184
290fceb2b1c0 (switch_to_buffer_1): New subroutine, taken out from Fswitch_to_buffer.
Richard M. Stallman <rms@gnu.org>
parents: 25181
diff changeset
2472 or where an overlay starts which ends at or after POS;
290fceb2b1c0 (switch_to_buffer_1): New subroutine, taken out from Fswitch_to_buffer.
Richard M. Stallman <rms@gnu.org>
parents: 25181
diff changeset
2473 or BEGV if there are no such overlays.
8967
80b92977ed08 (overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents: 8924
diff changeset
2474 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
2475
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
2476 *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
2477 when this function is called.
8c43cc245dd2 (overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents: 2791
diff changeset
2478
8c43cc245dd2 (overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents: 2791
diff changeset
2479 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
2480 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
2481 and we store only as many overlays as will fit.
30695
48cc3d076524 (overlays_at): Add CHANGE_REQ parameter.
Miles Bader <miles@gnu.org>
parents: 30360
diff changeset
2482 But we still return the total number of overlays.
48cc3d076524 (overlays_at): Add CHANGE_REQ parameter.
Miles Bader <miles@gnu.org>
parents: 30360
diff changeset
2483
48cc3d076524 (overlays_at): Add CHANGE_REQ parameter.
Miles Bader <miles@gnu.org>
parents: 30360
diff changeset
2484 If CHANGE_REQ is true, then any position written into *PREV_PTR or
48cc3d076524 (overlays_at): Add CHANGE_REQ parameter.
Miles Bader <miles@gnu.org>
parents: 30360
diff changeset
2485 *NEXT_PTR is guaranteed to be not equal to POS, unless it is the
48cc3d076524 (overlays_at): Add CHANGE_REQ parameter.
Miles Bader <miles@gnu.org>
parents: 30360
diff changeset
2486 default (BEGV or ZV). */
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
2487
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
2488 int
30695
48cc3d076524 (overlays_at): Add CHANGE_REQ parameter.
Miles Bader <miles@gnu.org>
parents: 30360
diff changeset
2489 overlays_at (pos, extend, vec_ptr, len_ptr, next_ptr, prev_ptr, change_req)
51824
9f5665eb77bd (reset_buffer, recenter_overlay_lists)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51782
diff changeset
2490 EMACS_INT pos;
2839
8c43cc245dd2 (overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents: 2791
diff changeset
2491 int extend;
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
2492 Lisp_Object **vec_ptr;
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
2493 int *len_ptr;
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
2494 int *next_ptr;
8967
80b92977ed08 (overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents: 8924
diff changeset
2495 int *prev_ptr;
30695
48cc3d076524 (overlays_at): Add CHANGE_REQ parameter.
Miles Bader <miles@gnu.org>
parents: 30360
diff changeset
2496 int change_req;
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
2497 {
51844
c5036e7cc93b (overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51827
diff changeset
2498 Lisp_Object overlay, start, end;
c5036e7cc93b (overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51827
diff changeset
2499 struct Lisp_Overlay *tail;
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
2500 int idx = 0;
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
2501 int len = *len_ptr;
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
2502 Lisp_Object *vec = *vec_ptr;
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
2503 int next = ZV;
8967
80b92977ed08 (overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents: 8924
diff changeset
2504 int prev = BEGV;
2839
8c43cc245dd2 (overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents: 2791
diff changeset
2505 int inhibit_storing = 0;
8c43cc245dd2 (overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents: 2791
diff changeset
2506
51844
c5036e7cc93b (overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51827
diff changeset
2507 for (tail = current_buffer->overlays_before; tail; tail = tail->next)
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
2508 {
8967
80b92977ed08 (overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents: 8924
diff changeset
2509 int startpos, endpos;
2776
8bf3bb4c20dd * lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents: 2722
diff changeset
2510
51844
c5036e7cc93b (overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51827
diff changeset
2511 XSETMISC (overlay, tail);
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
2512
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
2513 start = OVERLAY_START (overlay);
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
2514 end = OVERLAY_END (overlay);
8967
80b92977ed08 (overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents: 8924
diff changeset
2515 endpos = OVERLAY_POSITION (end);
80b92977ed08 (overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents: 8924
diff changeset
2516 if (endpos < pos)
80b92977ed08 (overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents: 8924
diff changeset
2517 {
80b92977ed08 (overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents: 8924
diff changeset
2518 if (prev < endpos)
80b92977ed08 (overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents: 8924
diff changeset
2519 prev = endpos;
80b92977ed08 (overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents: 8924
diff changeset
2520 break;
80b92977ed08 (overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents: 8924
diff changeset
2521 }
25184
290fceb2b1c0 (switch_to_buffer_1): New subroutine, taken out from Fswitch_to_buffer.
Richard M. Stallman <rms@gnu.org>
parents: 25181
diff changeset
2522 startpos = OVERLAY_POSITION (start);
290fceb2b1c0 (switch_to_buffer_1): New subroutine, taken out from Fswitch_to_buffer.
Richard M. Stallman <rms@gnu.org>
parents: 25181
diff changeset
2523 /* This one ends at or after POS
25205
14269f6d315b (Fprevious_overlay_change): Just return the answer obtained from overlays_at.
Richard M. Stallman <rms@gnu.org>
parents: 25184
diff changeset
2524 so its start counts for PREV_PTR if it's before POS. */
25184
290fceb2b1c0 (switch_to_buffer_1): New subroutine, taken out from Fswitch_to_buffer.
Richard M. Stallman <rms@gnu.org>
parents: 25181
diff changeset
2525 if (prev < startpos && startpos < pos)
290fceb2b1c0 (switch_to_buffer_1): New subroutine, taken out from Fswitch_to_buffer.
Richard M. Stallman <rms@gnu.org>
parents: 25181
diff changeset
2526 prev = startpos;
8967
80b92977ed08 (overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents: 8924
diff changeset
2527 if (endpos == pos)
80b92977ed08 (overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents: 8924
diff changeset
2528 continue;
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
2529 if (startpos <= pos)
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
2530 {
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
2531 if (idx == len)
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
2532 {
2839
8c43cc245dd2 (overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents: 2791
diff changeset
2533 /* The supplied vector is full.
8c43cc245dd2 (overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents: 2791
diff changeset
2534 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
2535 if (extend)
8c43cc245dd2 (overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents: 2791
diff changeset
2536 {
25021
7a31786a0335 (init_buffer_once): Init top_line_format.
Gerd Moellmann <gerd@gnu.org>
parents: 24975
diff changeset
2537 /* Make it work with an initial len == 0. */
7a31786a0335 (init_buffer_once): Init top_line_format.
Gerd Moellmann <gerd@gnu.org>
parents: 24975
diff changeset
2538 len *= 2;
7a31786a0335 (init_buffer_once): Init top_line_format.
Gerd Moellmann <gerd@gnu.org>
parents: 24975
diff changeset
2539 if (len == 0)
7a31786a0335 (init_buffer_once): Init top_line_format.
Gerd Moellmann <gerd@gnu.org>
parents: 24975
diff changeset
2540 len = 4;
7a31786a0335 (init_buffer_once): Init top_line_format.
Gerd Moellmann <gerd@gnu.org>
parents: 24975
diff changeset
2541 *len_ptr = len;
2839
8c43cc245dd2 (overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents: 2791
diff changeset
2542 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
2543 *vec_ptr = vec;
8c43cc245dd2 (overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents: 2791
diff changeset
2544 }
8c43cc245dd2 (overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents: 2791
diff changeset
2545 else
8c43cc245dd2 (overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents: 2791
diff changeset
2546 inhibit_storing = 1;
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
2547 }
2839
8c43cc245dd2 (overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents: 2791
diff changeset
2548
8c43cc245dd2 (overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents: 2791
diff changeset
2549 if (!inhibit_storing)
8c43cc245dd2 (overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents: 2791
diff changeset
2550 vec[idx] = overlay;
8c43cc245dd2 (overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents: 2791
diff changeset
2551 /* 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
2552 idx++;
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
2553 }
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
2554 else if (startpos < next)
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
2555 next = startpos;
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
2556 }
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
2557
51844
c5036e7cc93b (overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51827
diff changeset
2558 for (tail = current_buffer->overlays_after; tail; tail = tail->next)
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
2559 {
8967
80b92977ed08 (overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents: 8924
diff changeset
2560 int startpos, endpos;
2776
8bf3bb4c20dd * lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents: 2722
diff changeset
2561
51844
c5036e7cc93b (overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51827
diff changeset
2562 XSETMISC (overlay, tail);
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
2563
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
2564 start = OVERLAY_START (overlay);
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
2565 end = OVERLAY_END (overlay);
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
2566 startpos = OVERLAY_POSITION (start);
2776
8bf3bb4c20dd * lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents: 2722
diff changeset
2567 if (pos < startpos)
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
2568 {
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
2569 if (startpos < next)
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
2570 next = startpos;
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
2571 break;
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
2572 }
8967
80b92977ed08 (overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents: 8924
diff changeset
2573 endpos = OVERLAY_POSITION (end);
80b92977ed08 (overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents: 8924
diff changeset
2574 if (pos < endpos)
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
2575 {
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
2576 if (idx == len)
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
2577 {
2839
8c43cc245dd2 (overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents: 2791
diff changeset
2578 if (extend)
8c43cc245dd2 (overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents: 2791
diff changeset
2579 {
46920
a92cb918558c (overlays_at): Handle extending vec uniformly.
Richard M. Stallman <rms@gnu.org>
parents: 46864
diff changeset
2580 /* Make it work with an initial len == 0. */
a92cb918558c (overlays_at): Handle extending vec uniformly.
Richard M. Stallman <rms@gnu.org>
parents: 46864
diff changeset
2581 len *= 2;
25021
7a31786a0335 (init_buffer_once): Init top_line_format.
Gerd Moellmann <gerd@gnu.org>
parents: 24975
diff changeset
2582 if (len == 0)
46920
a92cb918558c (overlays_at): Handle extending vec uniformly.
Richard M. Stallman <rms@gnu.org>
parents: 46864
diff changeset
2583 len = 4;
a92cb918558c (overlays_at): Handle extending vec uniformly.
Richard M. Stallman <rms@gnu.org>
parents: 46864
diff changeset
2584 *len_ptr = len;
2839
8c43cc245dd2 (overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents: 2791
diff changeset
2585 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
2586 *vec_ptr = vec;
8c43cc245dd2 (overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents: 2791
diff changeset
2587 }
8c43cc245dd2 (overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents: 2791
diff changeset
2588 else
8c43cc245dd2 (overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents: 2791
diff changeset
2589 inhibit_storing = 1;
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
2590 }
2839
8c43cc245dd2 (overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents: 2791
diff changeset
2591
8c43cc245dd2 (overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents: 2791
diff changeset
2592 if (!inhibit_storing)
8c43cc245dd2 (overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents: 2791
diff changeset
2593 vec[idx] = overlay;
8c43cc245dd2 (overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents: 2791
diff changeset
2594 idx++;
25184
290fceb2b1c0 (switch_to_buffer_1): New subroutine, taken out from Fswitch_to_buffer.
Richard M. Stallman <rms@gnu.org>
parents: 25181
diff changeset
2595
290fceb2b1c0 (switch_to_buffer_1): New subroutine, taken out from Fswitch_to_buffer.
Richard M. Stallman <rms@gnu.org>
parents: 25181
diff changeset
2596 if (startpos < pos && startpos > prev)
290fceb2b1c0 (switch_to_buffer_1): New subroutine, taken out from Fswitch_to_buffer.
Richard M. Stallman <rms@gnu.org>
parents: 25181
diff changeset
2597 prev = startpos;
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
2598 }
8967
80b92977ed08 (overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents: 8924
diff changeset
2599 else if (endpos < pos && endpos > prev)
80b92977ed08 (overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents: 8924
diff changeset
2600 prev = endpos;
32856
5fe3b3dc5dd9 (overlays_at): Only let CHANGE_REQ inhibit an assignment of startpos to
Miles Bader <miles@gnu.org>
parents: 31886
diff changeset
2601 else if (endpos == pos && startpos > prev
5fe3b3dc5dd9 (overlays_at): Only let CHANGE_REQ inhibit an assignment of startpos to
Miles Bader <miles@gnu.org>
parents: 31886
diff changeset
2602 && (!change_req || startpos < pos))
25184
290fceb2b1c0 (switch_to_buffer_1): New subroutine, taken out from Fswitch_to_buffer.
Richard M. Stallman <rms@gnu.org>
parents: 25181
diff changeset
2603 prev = startpos;
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
2604 }
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
2605
8967
80b92977ed08 (overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents: 8924
diff changeset
2606 if (next_ptr)
80b92977ed08 (overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents: 8924
diff changeset
2607 *next_ptr = next;
80b92977ed08 (overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents: 8924
diff changeset
2608 if (prev_ptr)
80b92977ed08 (overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents: 8924
diff changeset
2609 *prev_ptr = prev;
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
2610 return idx;
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
2611 }
12382
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
2612
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
2613 /* 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
2614 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
2615
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49444
diff changeset
2616 Return the number found, and store them in a vector in *VEC_PTR.
12382
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
2617 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
2618 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
2619 or ZV if there are no more overlays.
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
2620 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
2621 or BEGV if there are no previous overlays.
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
2622 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
2623
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
2624 *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
2625 when this function is called.
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
2626
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
2627 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
2628 If EXTEND is zero, we never extend the vector,
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
2629 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
2630 But we still return the total number of overlays. */
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
2631
50304
d9d826db650f (overlays_in): Declare static.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50014
diff changeset
2632 static int
12382
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
2633 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
2634 int beg, end;
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
2635 int extend;
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
2636 Lisp_Object **vec_ptr;
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
2637 int *len_ptr;
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
2638 int *next_ptr;
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
2639 int *prev_ptr;
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
2640 {
51844
c5036e7cc93b (overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51827
diff changeset
2641 Lisp_Object overlay, ostart, oend;
c5036e7cc93b (overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51827
diff changeset
2642 struct Lisp_Overlay *tail;
12382
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
2643 int idx = 0;
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
2644 int len = *len_ptr;
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
2645 Lisp_Object *vec = *vec_ptr;
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
2646 int next = ZV;
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
2647 int prev = BEGV;
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
2648 int inhibit_storing = 0;
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
2649
51844
c5036e7cc93b (overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51827
diff changeset
2650 for (tail = current_buffer->overlays_before; tail; tail = tail->next)
12382
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
2651 {
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
2652 int startpos, endpos;
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
2653
51844
c5036e7cc93b (overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51827
diff changeset
2654 XSETMISC (overlay, tail);
12382
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
2655
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
2656 ostart = OVERLAY_START (overlay);
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
2657 oend = OVERLAY_END (overlay);
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
2658 endpos = OVERLAY_POSITION (oend);
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
2659 if (endpos < beg)
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
2660 {
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
2661 if (prev < endpos)
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
2662 prev = endpos;
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
2663 break;
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
2664 }
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
2665 startpos = OVERLAY_POSITION (ostart);
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
2666 /* 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
2667 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
2668 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
2669 || (startpos == endpos && beg == endpos))
12382
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
2670 {
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
2671 if (idx == len)
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
2672 {
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
2673 /* The supplied vector is full.
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
2674 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
2675 if (extend)
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
2676 {
46920
a92cb918558c (overlays_at): Handle extending vec uniformly.
Richard M. Stallman <rms@gnu.org>
parents: 46864
diff changeset
2677 /* Make it work with an initial len == 0. */
a92cb918558c (overlays_at): Handle extending vec uniformly.
Richard M. Stallman <rms@gnu.org>
parents: 46864
diff changeset
2678 len *= 2;
a92cb918558c (overlays_at): Handle extending vec uniformly.
Richard M. Stallman <rms@gnu.org>
parents: 46864
diff changeset
2679 if (len == 0)
a92cb918558c (overlays_at): Handle extending vec uniformly.
Richard M. Stallman <rms@gnu.org>
parents: 46864
diff changeset
2680 len = 4;
a92cb918558c (overlays_at): Handle extending vec uniformly.
Richard M. Stallman <rms@gnu.org>
parents: 46864
diff changeset
2681 *len_ptr = len;
12382
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
2682 vec = (Lisp_Object *) xrealloc (vec, len * sizeof (Lisp_Object));
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
2683 *vec_ptr = vec;
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
2684 }
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
2685 else
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
2686 inhibit_storing = 1;
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
2687 }
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
2688
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
2689 if (!inhibit_storing)
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
2690 vec[idx] = overlay;
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
2691 /* 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
2692 idx++;
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
2693 }
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
2694 else if (startpos < next)
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
2695 next = startpos;
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
2696 }
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
2697
51844
c5036e7cc93b (overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51827
diff changeset
2698 for (tail = current_buffer->overlays_after; tail; tail = tail->next)
12382
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
2699 {
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
2700 int startpos, endpos;
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
2701
51844
c5036e7cc93b (overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51827
diff changeset
2702 XSETMISC (overlay, tail);
12382
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
2703
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
2704 ostart = OVERLAY_START (overlay);
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
2705 oend = OVERLAY_END (overlay);
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
2706 startpos = OVERLAY_POSITION (ostart);
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
2707 if (end < startpos)
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
2708 {
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
2709 if (startpos < next)
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
2710 next = startpos;
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
2711 break;
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
2712 }
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
2713 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
2714 /* 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
2715 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
2716 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
2717 || (startpos == endpos && beg == endpos))
12382
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
2718 {
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
2719 if (idx == len)
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
2720 {
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
2721 if (extend)
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
2722 {
46920
a92cb918558c (overlays_at): Handle extending vec uniformly.
Richard M. Stallman <rms@gnu.org>
parents: 46864
diff changeset
2723 /* Make it work with an initial len == 0. */
a92cb918558c (overlays_at): Handle extending vec uniformly.
Richard M. Stallman <rms@gnu.org>
parents: 46864
diff changeset
2724 len *= 2;
a92cb918558c (overlays_at): Handle extending vec uniformly.
Richard M. Stallman <rms@gnu.org>
parents: 46864
diff changeset
2725 if (len == 0)
a92cb918558c (overlays_at): Handle extending vec uniformly.
Richard M. Stallman <rms@gnu.org>
parents: 46864
diff changeset
2726 len = 4;
a92cb918558c (overlays_at): Handle extending vec uniformly.
Richard M. Stallman <rms@gnu.org>
parents: 46864
diff changeset
2727 *len_ptr = len;
12382
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
2728 vec = (Lisp_Object *) xrealloc (vec, len * sizeof (Lisp_Object));
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
2729 *vec_ptr = vec;
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
2730 }
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
2731 else
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
2732 inhibit_storing = 1;
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
2733 }
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
2734
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
2735 if (!inhibit_storing)
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
2736 vec[idx] = overlay;
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
2737 idx++;
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
2738 }
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
2739 else if (endpos < beg && endpos > prev)
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
2740 prev = endpos;
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
2741 }
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
2742
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
2743 if (next_ptr)
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
2744 *next_ptr = next;
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
2745 if (prev_ptr)
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
2746 *prev_ptr = prev;
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
2747 return idx;
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
2748 }
36584
1f80152aeddc (mouse_face_overlay_overlaps): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 35339
diff changeset
2749
1f80152aeddc (mouse_face_overlay_overlaps): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 35339
diff changeset
2750
1f80152aeddc (mouse_face_overlay_overlaps): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 35339
diff changeset
2751 /* Return non-zero if there exists an overlay with a non-nil
1f80152aeddc (mouse_face_overlay_overlaps): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 35339
diff changeset
2752 `mouse-face' property overlapping OVERLAY. */
1f80152aeddc (mouse_face_overlay_overlaps): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 35339
diff changeset
2753
1f80152aeddc (mouse_face_overlay_overlaps): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 35339
diff changeset
2754 int
1f80152aeddc (mouse_face_overlay_overlaps): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 35339
diff changeset
2755 mouse_face_overlay_overlaps (overlay)
1f80152aeddc (mouse_face_overlay_overlaps): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 35339
diff changeset
2756 Lisp_Object overlay;
1f80152aeddc (mouse_face_overlay_overlaps): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 35339
diff changeset
2757 {
1f80152aeddc (mouse_face_overlay_overlaps): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 35339
diff changeset
2758 int start = OVERLAY_POSITION (OVERLAY_START (overlay));
1f80152aeddc (mouse_face_overlay_overlaps): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 35339
diff changeset
2759 int end = OVERLAY_POSITION (OVERLAY_END (overlay));
37463
7db9a70334b7 (mouse_face_overlay_overlaps): Fix the computation
Gerd Moellmann <gerd@gnu.org>
parents: 37011
diff changeset
2760 int n, i, size;
36584
1f80152aeddc (mouse_face_overlay_overlaps): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 35339
diff changeset
2761 Lisp_Object *v, tem;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49444
diff changeset
2762
37463
7db9a70334b7 (mouse_face_overlay_overlaps): Fix the computation
Gerd Moellmann <gerd@gnu.org>
parents: 37011
diff changeset
2763 size = 10;
7db9a70334b7 (mouse_face_overlay_overlaps): Fix the computation
Gerd Moellmann <gerd@gnu.org>
parents: 37011
diff changeset
2764 v = (Lisp_Object *) alloca (size * sizeof *v);
7db9a70334b7 (mouse_face_overlay_overlaps): Fix the computation
Gerd Moellmann <gerd@gnu.org>
parents: 37011
diff changeset
2765 n = overlays_in (start, end, 0, &v, &size, NULL, NULL);
7db9a70334b7 (mouse_face_overlay_overlaps): Fix the computation
Gerd Moellmann <gerd@gnu.org>
parents: 37011
diff changeset
2766 if (n > size)
36584
1f80152aeddc (mouse_face_overlay_overlaps): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 35339
diff changeset
2767 {
1f80152aeddc (mouse_face_overlay_overlaps): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 35339
diff changeset
2768 v = (Lisp_Object *) alloca (n * sizeof *v);
1f80152aeddc (mouse_face_overlay_overlaps): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 35339
diff changeset
2769 overlays_in (start, end, 0, &v, &n, NULL, NULL);
1f80152aeddc (mouse_face_overlay_overlaps): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 35339
diff changeset
2770 }
1f80152aeddc (mouse_face_overlay_overlaps): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 35339
diff changeset
2771
1f80152aeddc (mouse_face_overlay_overlaps): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 35339
diff changeset
2772 for (i = 0; i < n; ++i)
1f80152aeddc (mouse_face_overlay_overlaps): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 35339
diff changeset
2773 if (!EQ (v[i], overlay)
1f80152aeddc (mouse_face_overlay_overlaps): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 35339
diff changeset
2774 && (tem = Foverlay_get (overlay, Qmouse_face),
1f80152aeddc (mouse_face_overlay_overlaps): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 35339
diff changeset
2775 !NILP (tem)))
1f80152aeddc (mouse_face_overlay_overlaps): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 35339
diff changeset
2776 break;
1f80152aeddc (mouse_face_overlay_overlaps): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 35339
diff changeset
2777
1f80152aeddc (mouse_face_overlay_overlaps): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 35339
diff changeset
2778 return i < n;
1f80152aeddc (mouse_face_overlay_overlaps): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 35339
diff changeset
2779 }
1f80152aeddc (mouse_face_overlay_overlaps): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 35339
diff changeset
2780
1f80152aeddc (mouse_face_overlay_overlaps): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 35339
diff changeset
2781
12382
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
2782
11097
e1b4b0d66bf3 (overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents: 11052
diff changeset
2783 /* 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
2784 int
e1b4b0d66bf3 (overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents: 11052
diff changeset
2785 overlay_touches_p (pos)
e1b4b0d66bf3 (overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents: 11052
diff changeset
2786 int pos;
e1b4b0d66bf3 (overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents: 11052
diff changeset
2787 {
51844
c5036e7cc93b (overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51827
diff changeset
2788 Lisp_Object overlay;
c5036e7cc93b (overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51827
diff changeset
2789 struct Lisp_Overlay *tail;
c5036e7cc93b (overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51827
diff changeset
2790
c5036e7cc93b (overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51827
diff changeset
2791 for (tail = current_buffer->overlays_before; tail; tail = tail->next)
11097
e1b4b0d66bf3 (overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents: 11052
diff changeset
2792 {
e1b4b0d66bf3 (overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents: 11052
diff changeset
2793 int endpos;
e1b4b0d66bf3 (overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents: 11052
diff changeset
2794
51844
c5036e7cc93b (overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51827
diff changeset
2795 XSETMISC (overlay ,tail);
11097
e1b4b0d66bf3 (overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents: 11052
diff changeset
2796 if (!GC_OVERLAYP (overlay))
e1b4b0d66bf3 (overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents: 11052
diff changeset
2797 abort ();
e1b4b0d66bf3 (overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents: 11052
diff changeset
2798
e1b4b0d66bf3 (overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents: 11052
diff changeset
2799 endpos = OVERLAY_POSITION (OVERLAY_END (overlay));
e1b4b0d66bf3 (overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents: 11052
diff changeset
2800 if (endpos < pos)
e1b4b0d66bf3 (overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents: 11052
diff changeset
2801 break;
e1b4b0d66bf3 (overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents: 11052
diff changeset
2802 if (endpos == pos || OVERLAY_POSITION (OVERLAY_START (overlay)) == pos)
e1b4b0d66bf3 (overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents: 11052
diff changeset
2803 return 1;
e1b4b0d66bf3 (overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents: 11052
diff changeset
2804 }
e1b4b0d66bf3 (overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents: 11052
diff changeset
2805
51844
c5036e7cc93b (overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51827
diff changeset
2806 for (tail = current_buffer->overlays_after; tail; tail = tail->next)
11097
e1b4b0d66bf3 (overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents: 11052
diff changeset
2807 {
e1b4b0d66bf3 (overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents: 11052
diff changeset
2808 int startpos;
e1b4b0d66bf3 (overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents: 11052
diff changeset
2809
51844
c5036e7cc93b (overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51827
diff changeset
2810 XSETMISC (overlay, tail);
11097
e1b4b0d66bf3 (overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents: 11052
diff changeset
2811 if (!GC_OVERLAYP (overlay))
e1b4b0d66bf3 (overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents: 11052
diff changeset
2812 abort ();
e1b4b0d66bf3 (overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents: 11052
diff changeset
2813
e1b4b0d66bf3 (overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents: 11052
diff changeset
2814 startpos = OVERLAY_POSITION (OVERLAY_START (overlay));
e1b4b0d66bf3 (overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents: 11052
diff changeset
2815 if (pos < startpos)
e1b4b0d66bf3 (overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents: 11052
diff changeset
2816 break;
e1b4b0d66bf3 (overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents: 11052
diff changeset
2817 if (startpos == pos || OVERLAY_POSITION (OVERLAY_END (overlay)) == pos)
e1b4b0d66bf3 (overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents: 11052
diff changeset
2818 return 1;
e1b4b0d66bf3 (overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents: 11052
diff changeset
2819 }
e1b4b0d66bf3 (overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents: 11052
diff changeset
2820 return 0;
e1b4b0d66bf3 (overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents: 11052
diff changeset
2821 }
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
2822
5857
03f8720af7fb (sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents: 5703
diff changeset
2823 struct sortvec
03f8720af7fb (sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents: 5703
diff changeset
2824 {
03f8720af7fb (sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents: 5703
diff changeset
2825 Lisp_Object overlay;
03f8720af7fb (sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents: 5703
diff changeset
2826 int beg, end;
03f8720af7fb (sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents: 5703
diff changeset
2827 int priority;
03f8720af7fb (sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents: 5703
diff changeset
2828 };
03f8720af7fb (sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents: 5703
diff changeset
2829
03f8720af7fb (sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents: 5703
diff changeset
2830 static int
21514
fa9ff387d260 Fix -Wimplicit warnings.
Andreas Schwab <schwab@suse.de>
parents: 21506
diff changeset
2831 compare_overlays (v1, v2)
fa9ff387d260 Fix -Wimplicit warnings.
Andreas Schwab <schwab@suse.de>
parents: 21506
diff changeset
2832 const void *v1, *v2;
5857
03f8720af7fb (sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents: 5703
diff changeset
2833 {
21514
fa9ff387d260 Fix -Wimplicit warnings.
Andreas Schwab <schwab@suse.de>
parents: 21506
diff changeset
2834 const struct sortvec *s1 = (const struct sortvec *) v1;
fa9ff387d260 Fix -Wimplicit warnings.
Andreas Schwab <schwab@suse.de>
parents: 21506
diff changeset
2835 const struct sortvec *s2 = (const struct sortvec *) v2;
5857
03f8720af7fb (sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents: 5703
diff changeset
2836 if (s1->priority != s2->priority)
03f8720af7fb (sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents: 5703
diff changeset
2837 return s1->priority - s2->priority;
03f8720af7fb (sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents: 5703
diff changeset
2838 if (s1->beg != s2->beg)
03f8720af7fb (sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents: 5703
diff changeset
2839 return s1->beg - s2->beg;
03f8720af7fb (sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents: 5703
diff changeset
2840 if (s1->end != s2->end)
03f8720af7fb (sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents: 5703
diff changeset
2841 return s2->end - s1->end;
03f8720af7fb (sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents: 5703
diff changeset
2842 return 0;
03f8720af7fb (sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents: 5703
diff changeset
2843 }
03f8720af7fb (sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents: 5703
diff changeset
2844
03f8720af7fb (sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents: 5703
diff changeset
2845 /* 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
2846 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
2847 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
2848 int
03f8720af7fb (sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents: 5703
diff changeset
2849 sort_overlays (overlay_vec, noverlays, w)
03f8720af7fb (sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents: 5703
diff changeset
2850 Lisp_Object *overlay_vec;
03f8720af7fb (sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents: 5703
diff changeset
2851 int noverlays;
03f8720af7fb (sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents: 5703
diff changeset
2852 struct window *w;
03f8720af7fb (sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents: 5703
diff changeset
2853 {
03f8720af7fb (sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents: 5703
diff changeset
2854 int i, j;
03f8720af7fb (sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents: 5703
diff changeset
2855 struct sortvec *sortvec;
03f8720af7fb (sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents: 5703
diff changeset
2856 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
2857
03f8720af7fb (sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents: 5703
diff changeset
2858 /* 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
2859
03f8720af7fb (sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents: 5703
diff changeset
2860 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
2861 {
6061
e40292d5c167 (sort_overlays): Allow for null window.
Karl Heuer <kwzh@gnu.org>
parents: 6051
diff changeset
2862 Lisp_Object tem;
6493
33a461f14903 (sort_overlays, Fmake_overlay): Use assignment, not initialization.
Karl Heuer <kwzh@gnu.org>
parents: 6477
diff changeset
2863 Lisp_Object overlay;
33a461f14903 (sort_overlays, Fmake_overlay): Use assignment, not initialization.
Karl Heuer <kwzh@gnu.org>
parents: 6477
diff changeset
2864
33a461f14903 (sort_overlays, Fmake_overlay): Use assignment, not initialization.
Karl Heuer <kwzh@gnu.org>
parents: 6477
diff changeset
2865 overlay = overlay_vec[i];
5857
03f8720af7fb (sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents: 5703
diff changeset
2866 if (OVERLAY_VALID (overlay)
03f8720af7fb (sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents: 5703
diff changeset
2867 && OVERLAY_POSITION (OVERLAY_START (overlay)) > 0
03f8720af7fb (sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents: 5703
diff changeset
2868 && OVERLAY_POSITION (OVERLAY_END (overlay)) > 0)
03f8720af7fb (sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents: 5703
diff changeset
2869 {
6061
e40292d5c167 (sort_overlays): Allow for null window.
Karl Heuer <kwzh@gnu.org>
parents: 6051
diff changeset
2870 /* 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
2871 overlays that are limited to some other window. */
e40292d5c167 (sort_overlays): Allow for null window.
Karl Heuer <kwzh@gnu.org>
parents: 6051
diff changeset
2872 if (w)
5857
03f8720af7fb (sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents: 5703
diff changeset
2873 {
6061
e40292d5c167 (sort_overlays): Allow for null window.
Karl Heuer <kwzh@gnu.org>
parents: 6051
diff changeset
2874 Lisp_Object window;
e40292d5c167 (sort_overlays): Allow for null window.
Karl Heuer <kwzh@gnu.org>
parents: 6051
diff changeset
2875
e40292d5c167 (sort_overlays): Allow for null window.
Karl Heuer <kwzh@gnu.org>
parents: 6051
diff changeset
2876 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
2877 if (WINDOWP (window) && XWINDOW (window) != w)
6061
e40292d5c167 (sort_overlays): Allow for null window.
Karl Heuer <kwzh@gnu.org>
parents: 6051
diff changeset
2878 continue;
5857
03f8720af7fb (sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents: 5703
diff changeset
2879 }
6061
e40292d5c167 (sort_overlays): Allow for null window.
Karl Heuer <kwzh@gnu.org>
parents: 6051
diff changeset
2880
e40292d5c167 (sort_overlays): Allow for null window.
Karl Heuer <kwzh@gnu.org>
parents: 6051
diff changeset
2881 /* 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
2882 sortvec[j].overlay = overlay;
e40292d5c167 (sort_overlays): Allow for null window.
Karl Heuer <kwzh@gnu.org>
parents: 6051
diff changeset
2883 sortvec[j].beg = OVERLAY_POSITION (OVERLAY_START (overlay));
e40292d5c167 (sort_overlays): Allow for null window.
Karl Heuer <kwzh@gnu.org>
parents: 6051
diff changeset
2884 sortvec[j].end = OVERLAY_POSITION (OVERLAY_END (overlay));
e40292d5c167 (sort_overlays): Allow for null window.
Karl Heuer <kwzh@gnu.org>
parents: 6051
diff changeset
2885 tem = Foverlay_get (overlay, Qpriority);
e40292d5c167 (sort_overlays): Allow for null window.
Karl Heuer <kwzh@gnu.org>
parents: 6051
diff changeset
2886 if (INTEGERP (tem))
e40292d5c167 (sort_overlays): Allow for null window.
Karl Heuer <kwzh@gnu.org>
parents: 6051
diff changeset
2887 sortvec[j].priority = XINT (tem);
e40292d5c167 (sort_overlays): Allow for null window.
Karl Heuer <kwzh@gnu.org>
parents: 6051
diff changeset
2888 else
e40292d5c167 (sort_overlays): Allow for null window.
Karl Heuer <kwzh@gnu.org>
parents: 6051
diff changeset
2889 sortvec[j].priority = 0;
e40292d5c167 (sort_overlays): Allow for null window.
Karl Heuer <kwzh@gnu.org>
parents: 6051
diff changeset
2890 j++;
5857
03f8720af7fb (sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents: 5703
diff changeset
2891 }
03f8720af7fb (sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents: 5703
diff changeset
2892 }
03f8720af7fb (sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents: 5703
diff changeset
2893 noverlays = j;
03f8720af7fb (sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents: 5703
diff changeset
2894
03f8720af7fb (sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents: 5703
diff changeset
2895 /* 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
2896
03f8720af7fb (sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents: 5703
diff changeset
2897 if (noverlays > 1)
03f8720af7fb (sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents: 5703
diff changeset
2898 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
2899
03f8720af7fb (sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents: 5703
diff changeset
2900 for (i = 0; i < noverlays; i++)
03f8720af7fb (sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents: 5703
diff changeset
2901 overlay_vec[i] = sortvec[i].overlay;
03f8720af7fb (sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents: 5703
diff changeset
2902 return (noverlays);
03f8720af7fb (sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents: 5703
diff changeset
2903 }
03f8720af7fb (sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents: 5703
diff changeset
2904
11693
efef31f1c42d (Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents: 11659
diff changeset
2905 struct sortstr
efef31f1c42d (Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents: 11659
diff changeset
2906 {
12699
d0f4113de2ea (record_overlay_string, overlay_strings): Handle zero-sized overlays better.
Karl Heuer <kwzh@gnu.org>
parents: 12697
diff changeset
2907 Lisp_Object string, string2;
11693
efef31f1c42d (Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents: 11659
diff changeset
2908 int size;
efef31f1c42d (Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents: 11659
diff changeset
2909 int priority;
efef31f1c42d (Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents: 11659
diff changeset
2910 };
efef31f1c42d (Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents: 11659
diff changeset
2911
12697
9ebf33d6d07c (struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents: 12538
diff changeset
2912 struct sortstrlist
9ebf33d6d07c (struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents: 12538
diff changeset
2913 {
9ebf33d6d07c (struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents: 12538
diff changeset
2914 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
2915 int size; /* Allocated length of that array. */
9ebf33d6d07c (struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents: 12538
diff changeset
2916 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
2917 int bytes; /* Total length of the strings in buf. */
9ebf33d6d07c (struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents: 12538
diff changeset
2918 };
9ebf33d6d07c (struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents: 12538
diff changeset
2919
9ebf33d6d07c (struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents: 12538
diff changeset
2920 /* Buffers for storing information about the overlays touching a given
9ebf33d6d07c (struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents: 12538
diff changeset
2921 position. These could be automatic variables in overlay_strings, but
9ebf33d6d07c (struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents: 12538
diff changeset
2922 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
2923 allocating and freeing it. */
9ebf33d6d07c (struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents: 12538
diff changeset
2924 static struct sortstrlist overlay_heads, overlay_tails;
18526
e0d1b341124c (overlay_str_buf): Declare as unsigned char *.
Richard M. Stallman <rms@gnu.org>
parents: 18495
diff changeset
2925 static unsigned char *overlay_str_buf;
12697
9ebf33d6d07c (struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents: 12538
diff changeset
2926
9ebf33d6d07c (struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents: 12538
diff changeset
2927 /* Allocated length of overlay_str_buf. */
9ebf33d6d07c (struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents: 12538
diff changeset
2928 static int overlay_str_len;
9ebf33d6d07c (struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents: 12538
diff changeset
2929
11693
efef31f1c42d (Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents: 11659
diff changeset
2930 /* A comparison function suitable for passing to qsort. */
efef31f1c42d (Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents: 11659
diff changeset
2931 static int
efef31f1c42d (Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents: 11659
diff changeset
2932 cmp_for_strings (as1, as2)
efef31f1c42d (Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents: 11659
diff changeset
2933 char *as1, *as2;
efef31f1c42d (Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents: 11659
diff changeset
2934 {
efef31f1c42d (Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents: 11659
diff changeset
2935 struct sortstr *s1 = (struct sortstr *)as1;
efef31f1c42d (Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents: 11659
diff changeset
2936 struct sortstr *s2 = (struct sortstr *)as2;
efef31f1c42d (Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents: 11659
diff changeset
2937 if (s1->size != s2->size)
efef31f1c42d (Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents: 11659
diff changeset
2938 return s2->size - s1->size;
efef31f1c42d (Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents: 11659
diff changeset
2939 if (s1->priority != s2->priority)
efef31f1c42d (Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents: 11659
diff changeset
2940 return s1->priority - s2->priority;
efef31f1c42d (Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents: 11659
diff changeset
2941 return 0;
efef31f1c42d (Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents: 11659
diff changeset
2942 }
efef31f1c42d (Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents: 11659
diff changeset
2943
12697
9ebf33d6d07c (struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents: 12538
diff changeset
2944 static void
12699
d0f4113de2ea (record_overlay_string, overlay_strings): Handle zero-sized overlays better.
Karl Heuer <kwzh@gnu.org>
parents: 12697
diff changeset
2945 record_overlay_string (ssl, str, str2, pri, size)
12697
9ebf33d6d07c (struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents: 12538
diff changeset
2946 struct sortstrlist *ssl;
12699
d0f4113de2ea (record_overlay_string, overlay_strings): Handle zero-sized overlays better.
Karl Heuer <kwzh@gnu.org>
parents: 12697
diff changeset
2947 Lisp_Object str, str2, pri;
12697
9ebf33d6d07c (struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents: 12538
diff changeset
2948 int size;
9ebf33d6d07c (struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents: 12538
diff changeset
2949 {
20586
90d6a75210d6 (record_overlay_string): Totalize sizes assuming
Richard M. Stallman <rms@gnu.org>
parents: 20538
diff changeset
2950 int nbytes;
90d6a75210d6 (record_overlay_string): Totalize sizes assuming
Richard M. Stallman <rms@gnu.org>
parents: 20538
diff changeset
2951
12697
9ebf33d6d07c (struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents: 12538
diff changeset
2952 if (ssl->used == ssl->size)
9ebf33d6d07c (struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents: 12538
diff changeset
2953 {
9ebf33d6d07c (struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents: 12538
diff changeset
2954 if (ssl->buf)
9ebf33d6d07c (struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents: 12538
diff changeset
2955 ssl->size *= 2;
9ebf33d6d07c (struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents: 12538
diff changeset
2956 else
9ebf33d6d07c (struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents: 12538
diff changeset
2957 ssl->size = 5;
9ebf33d6d07c (struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents: 12538
diff changeset
2958 ssl->buf = ((struct sortstr *)
9ebf33d6d07c (struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents: 12538
diff changeset
2959 xrealloc (ssl->buf, ssl->size * sizeof (struct sortstr)));
9ebf33d6d07c (struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents: 12538
diff changeset
2960 }
9ebf33d6d07c (struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents: 12538
diff changeset
2961 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
2962 ssl->buf[ssl->used].string2 = str2;
12697
9ebf33d6d07c (struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents: 12538
diff changeset
2963 ssl->buf[ssl->used].size = size;
9ebf33d6d07c (struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents: 12538
diff changeset
2964 ssl->buf[ssl->used].priority = (INTEGERP (pri) ? XINT (pri) : 0);
9ebf33d6d07c (struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents: 12538
diff changeset
2965 ssl->used++;
20586
90d6a75210d6 (record_overlay_string): Totalize sizes assuming
Richard M. Stallman <rms@gnu.org>
parents: 20538
diff changeset
2966
90d6a75210d6 (record_overlay_string): Totalize sizes assuming
Richard M. Stallman <rms@gnu.org>
parents: 20538
diff changeset
2967 if (NILP (current_buffer->enable_multibyte_characters))
46370
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46293
diff changeset
2968 nbytes = SCHARS (str);
20586
90d6a75210d6 (record_overlay_string): Totalize sizes assuming
Richard M. Stallman <rms@gnu.org>
parents: 20538
diff changeset
2969 else if (! STRING_MULTIBYTE (str))
46370
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46293
diff changeset
2970 nbytes = count_size_as_multibyte (SDATA (str),
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46293
diff changeset
2971 SBYTES (str));
20586
90d6a75210d6 (record_overlay_string): Totalize sizes assuming
Richard M. Stallman <rms@gnu.org>
parents: 20538
diff changeset
2972 else
46370
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46293
diff changeset
2973 nbytes = SBYTES (str);
20586
90d6a75210d6 (record_overlay_string): Totalize sizes assuming
Richard M. Stallman <rms@gnu.org>
parents: 20538
diff changeset
2974
90d6a75210d6 (record_overlay_string): Totalize sizes assuming
Richard M. Stallman <rms@gnu.org>
parents: 20538
diff changeset
2975 ssl->bytes += nbytes;
90d6a75210d6 (record_overlay_string): Totalize sizes assuming
Richard M. Stallman <rms@gnu.org>
parents: 20538
diff changeset
2976
12699
d0f4113de2ea (record_overlay_string, overlay_strings): Handle zero-sized overlays better.
Karl Heuer <kwzh@gnu.org>
parents: 12697
diff changeset
2977 if (STRINGP (str2))
20586
90d6a75210d6 (record_overlay_string): Totalize sizes assuming
Richard M. Stallman <rms@gnu.org>
parents: 20538
diff changeset
2978 {
90d6a75210d6 (record_overlay_string): Totalize sizes assuming
Richard M. Stallman <rms@gnu.org>
parents: 20538
diff changeset
2979 if (NILP (current_buffer->enable_multibyte_characters))
46370
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46293
diff changeset
2980 nbytes = SCHARS (str2);
20586
90d6a75210d6 (record_overlay_string): Totalize sizes assuming
Richard M. Stallman <rms@gnu.org>
parents: 20538
diff changeset
2981 else if (! STRING_MULTIBYTE (str2))
46370
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46293
diff changeset
2982 nbytes = count_size_as_multibyte (SDATA (str2),
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46293
diff changeset
2983 SBYTES (str2));
20586
90d6a75210d6 (record_overlay_string): Totalize sizes assuming
Richard M. Stallman <rms@gnu.org>
parents: 20538
diff changeset
2984 else
46370
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46293
diff changeset
2985 nbytes = SBYTES (str2);
20586
90d6a75210d6 (record_overlay_string): Totalize sizes assuming
Richard M. Stallman <rms@gnu.org>
parents: 20538
diff changeset
2986
90d6a75210d6 (record_overlay_string): Totalize sizes assuming
Richard M. Stallman <rms@gnu.org>
parents: 20538
diff changeset
2987 ssl->bytes += nbytes;
90d6a75210d6 (record_overlay_string): Totalize sizes assuming
Richard M. Stallman <rms@gnu.org>
parents: 20538
diff changeset
2988 }
12697
9ebf33d6d07c (struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents: 12538
diff changeset
2989 }
11693
efef31f1c42d (Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents: 11659
diff changeset
2990
efef31f1c42d (Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents: 11659
diff changeset
2991 /* 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
2992 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
2993 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
2994 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
2995 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
2996 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
2997 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
2998
d0f4113de2ea (record_overlay_string, overlay_strings): Handle zero-sized overlays better.
Karl Heuer <kwzh@gnu.org>
parents: 12697
diff changeset
2999 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
3000 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
3001 subsequent calls. */
16243
b311d8755530 (overlay_strings): Declare pstr using unsigned char.
Richard M. Stallman <rms@gnu.org>
parents: 16213
diff changeset
3002
11693
efef31f1c42d (Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents: 11659
diff changeset
3003 int
efef31f1c42d (Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents: 11659
diff changeset
3004 overlay_strings (pos, w, pstr)
51824
9f5665eb77bd (reset_buffer, recenter_overlay_lists)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51782
diff changeset
3005 EMACS_INT pos;
11693
efef31f1c42d (Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents: 11659
diff changeset
3006 struct window *w;
16243
b311d8755530 (overlay_strings): Declare pstr using unsigned char.
Richard M. Stallman <rms@gnu.org>
parents: 16213
diff changeset
3007 unsigned char **pstr;
11693
efef31f1c42d (Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents: 11659
diff changeset
3008 {
51844
c5036e7cc93b (overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51827
diff changeset
3009 Lisp_Object overlay, window, str;
c5036e7cc93b (overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51827
diff changeset
3010 struct Lisp_Overlay *ov;
11693
efef31f1c42d (Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents: 11659
diff changeset
3011 int startpos, endpos;
20586
90d6a75210d6 (record_overlay_string): Totalize sizes assuming
Richard M. Stallman <rms@gnu.org>
parents: 20538
diff changeset
3012 int multibyte = ! NILP (current_buffer->enable_multibyte_characters);
11693
efef31f1c42d (Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents: 11659
diff changeset
3013
12697
9ebf33d6d07c (struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents: 12538
diff changeset
3014 overlay_heads.used = overlay_heads.bytes = 0;
9ebf33d6d07c (struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents: 12538
diff changeset
3015 overlay_tails.used = overlay_tails.bytes = 0;
51844
c5036e7cc93b (overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51827
diff changeset
3016 for (ov = current_buffer->overlays_before; ov; ov = ov->next)
11693
efef31f1c42d (Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents: 11659
diff changeset
3017 {
51844
c5036e7cc93b (overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51827
diff changeset
3018 XSETMISC (overlay, ov);
51824
9f5665eb77bd (reset_buffer, recenter_overlay_lists)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51782
diff changeset
3019 eassert (OVERLAYP (overlay));
11693
efef31f1c42d (Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents: 11659
diff changeset
3020
efef31f1c42d (Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents: 11659
diff changeset
3021 startpos = OVERLAY_POSITION (OVERLAY_START (overlay));
efef31f1c42d (Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents: 11659
diff changeset
3022 endpos = OVERLAY_POSITION (OVERLAY_END (overlay));
efef31f1c42d (Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents: 11659
diff changeset
3023 if (endpos < pos)
efef31f1c42d (Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents: 11659
diff changeset
3024 break;
efef31f1c42d (Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents: 11659
diff changeset
3025 if (endpos != pos && startpos != pos)
efef31f1c42d (Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents: 11659
diff changeset
3026 continue;
efef31f1c42d (Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents: 11659
diff changeset
3027 window = Foverlay_get (overlay, Qwindow);
efef31f1c42d (Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents: 11659
diff changeset
3028 if (WINDOWP (window) && XWINDOW (window) != w)
efef31f1c42d (Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents: 11659
diff changeset
3029 continue;
12697
9ebf33d6d07c (struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents: 12538
diff changeset
3030 if (startpos == pos
9ebf33d6d07c (struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents: 12538
diff changeset
3031 && (str = Foverlay_get (overlay, Qbefore_string), STRINGP (str)))
9ebf33d6d07c (struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents: 12538
diff changeset
3032 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
3033 (startpos == endpos
d0f4113de2ea (record_overlay_string, overlay_strings): Handle zero-sized overlays better.
Karl Heuer <kwzh@gnu.org>
parents: 12697
diff changeset
3034 ? 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
3035 : Qnil),
d0f4113de2ea (record_overlay_string, overlay_strings): Handle zero-sized overlays better.
Karl Heuer <kwzh@gnu.org>
parents: 12697
diff changeset
3036 Foverlay_get (overlay, Qpriority),
d0f4113de2ea (record_overlay_string, overlay_strings): Handle zero-sized overlays better.
Karl Heuer <kwzh@gnu.org>
parents: 12697
diff changeset
3037 endpos - startpos);
d0f4113de2ea (record_overlay_string, overlay_strings): Handle zero-sized overlays better.
Karl Heuer <kwzh@gnu.org>
parents: 12697
diff changeset
3038 else if (endpos == pos
d0f4113de2ea (record_overlay_string, overlay_strings): Handle zero-sized overlays better.
Karl Heuer <kwzh@gnu.org>
parents: 12697
diff changeset
3039 && (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
3040 record_overlay_string (&overlay_tails, str, Qnil,
12697
9ebf33d6d07c (struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents: 12538
diff changeset
3041 Foverlay_get (overlay, Qpriority),
9ebf33d6d07c (struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents: 12538
diff changeset
3042 endpos - startpos);
11693
efef31f1c42d (Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents: 11659
diff changeset
3043 }
51844
c5036e7cc93b (overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51827
diff changeset
3044 for (ov = current_buffer->overlays_after; ov; ov = ov->next)
11693
efef31f1c42d (Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents: 11659
diff changeset
3045 {
51844
c5036e7cc93b (overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51827
diff changeset
3046 XSETMISC (overlay, ov);
c5036e7cc93b (overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51827
diff changeset
3047 eassert (OVERLAYP (overlay));
11693
efef31f1c42d (Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents: 11659
diff changeset
3048
efef31f1c42d (Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents: 11659
diff changeset
3049 startpos = OVERLAY_POSITION (OVERLAY_START (overlay));
efef31f1c42d (Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents: 11659
diff changeset
3050 endpos = OVERLAY_POSITION (OVERLAY_END (overlay));
efef31f1c42d (Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents: 11659
diff changeset
3051 if (startpos > pos)
efef31f1c42d (Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents: 11659
diff changeset
3052 break;
12697
9ebf33d6d07c (struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents: 12538
diff changeset
3053 if (endpos != pos && startpos != pos)
9ebf33d6d07c (struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents: 12538
diff changeset
3054 continue;
9ebf33d6d07c (struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents: 12538
diff changeset
3055 window = Foverlay_get (overlay, Qwindow);
9ebf33d6d07c (struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents: 12538
diff changeset
3056 if (WINDOWP (window) && XWINDOW (window) != w)
9ebf33d6d07c (struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents: 12538
diff changeset
3057 continue;
9ebf33d6d07c (struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents: 12538
diff changeset
3058 if (startpos == pos
9ebf33d6d07c (struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents: 12538
diff changeset
3059 && (str = Foverlay_get (overlay, Qbefore_string), STRINGP (str)))
9ebf33d6d07c (struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents: 12538
diff changeset
3060 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
3061 (startpos == endpos
d0f4113de2ea (record_overlay_string, overlay_strings): Handle zero-sized overlays better.
Karl Heuer <kwzh@gnu.org>
parents: 12697
diff changeset
3062 ? 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
3063 : Qnil),
d0f4113de2ea (record_overlay_string, overlay_strings): Handle zero-sized overlays better.
Karl Heuer <kwzh@gnu.org>
parents: 12697
diff changeset
3064 Foverlay_get (overlay, Qpriority),
d0f4113de2ea (record_overlay_string, overlay_strings): Handle zero-sized overlays better.
Karl Heuer <kwzh@gnu.org>
parents: 12697
diff changeset
3065 endpos - startpos);
d0f4113de2ea (record_overlay_string, overlay_strings): Handle zero-sized overlays better.
Karl Heuer <kwzh@gnu.org>
parents: 12697
diff changeset
3066 else if (endpos == pos
d0f4113de2ea (record_overlay_string, overlay_strings): Handle zero-sized overlays better.
Karl Heuer <kwzh@gnu.org>
parents: 12697
diff changeset
3067 && (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
3068 record_overlay_string (&overlay_tails, str, Qnil,
12697
9ebf33d6d07c (struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents: 12538
diff changeset
3069 Foverlay_get (overlay, Qpriority),
9ebf33d6d07c (struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents: 12538
diff changeset
3070 endpos - startpos);
11693
efef31f1c42d (Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents: 11659
diff changeset
3071 }
12697
9ebf33d6d07c (struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents: 12538
diff changeset
3072 if (overlay_tails.used > 1)
9ebf33d6d07c (struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents: 12538
diff changeset
3073 qsort (overlay_tails.buf, overlay_tails.used, sizeof (struct sortstr),
9ebf33d6d07c (struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents: 12538
diff changeset
3074 cmp_for_strings);
9ebf33d6d07c (struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents: 12538
diff changeset
3075 if (overlay_heads.used > 1)
9ebf33d6d07c (struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents: 12538
diff changeset
3076 qsort (overlay_heads.buf, overlay_heads.used, sizeof (struct sortstr),
9ebf33d6d07c (struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents: 12538
diff changeset
3077 cmp_for_strings);
9ebf33d6d07c (struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents: 12538
diff changeset
3078 if (overlay_heads.bytes || overlay_tails.bytes)
11693
efef31f1c42d (Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents: 11659
diff changeset
3079 {
12697
9ebf33d6d07c (struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents: 12538
diff changeset
3080 Lisp_Object tem;
11693
efef31f1c42d (Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents: 11659
diff changeset
3081 int i;
18603
525fb9a7cc96 (overlay_strings): Finish up previous change.
Richard M. Stallman <rms@gnu.org>
parents: 18526
diff changeset
3082 unsigned char *p;
12697
9ebf33d6d07c (struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents: 12538
diff changeset
3083 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
3084
efef31f1c42d (Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents: 11659
diff changeset
3085 if (total > overlay_str_len)
18603
525fb9a7cc96 (overlay_strings): Finish up previous change.
Richard M. Stallman <rms@gnu.org>
parents: 18526
diff changeset
3086 {
525fb9a7cc96 (overlay_strings): Finish up previous change.
Richard M. Stallman <rms@gnu.org>
parents: 18526
diff changeset
3087 overlay_str_len = total;
525fb9a7cc96 (overlay_strings): Finish up previous change.
Richard M. Stallman <rms@gnu.org>
parents: 18526
diff changeset
3088 overlay_str_buf = (unsigned char *)xrealloc (overlay_str_buf,
525fb9a7cc96 (overlay_strings): Finish up previous change.
Richard M. Stallman <rms@gnu.org>
parents: 18526
diff changeset
3089 total);
525fb9a7cc96 (overlay_strings): Finish up previous change.
Richard M. Stallman <rms@gnu.org>
parents: 18526
diff changeset
3090 }
12697
9ebf33d6d07c (struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents: 12538
diff changeset
3091 p = overlay_str_buf;
9ebf33d6d07c (struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents: 12538
diff changeset
3092 for (i = overlay_tails.used; --i >= 0;)
11693
efef31f1c42d (Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents: 11659
diff changeset
3093 {
20586
90d6a75210d6 (record_overlay_string): Totalize sizes assuming
Richard M. Stallman <rms@gnu.org>
parents: 20538
diff changeset
3094 int nbytes;
12697
9ebf33d6d07c (struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents: 12538
diff changeset
3095 tem = overlay_tails.buf[i].string;
46370
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46293
diff changeset
3096 nbytes = copy_text (SDATA (tem), p,
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46293
diff changeset
3097 SBYTES (tem),
20586
90d6a75210d6 (record_overlay_string): Totalize sizes assuming
Richard M. Stallman <rms@gnu.org>
parents: 20538
diff changeset
3098 STRING_MULTIBYTE (tem), multibyte);
90d6a75210d6 (record_overlay_string): Totalize sizes assuming
Richard M. Stallman <rms@gnu.org>
parents: 20538
diff changeset
3099 p += nbytes;
11693
efef31f1c42d (Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents: 11659
diff changeset
3100 }
12697
9ebf33d6d07c (struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents: 12538
diff changeset
3101 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
3102 {
20586
90d6a75210d6 (record_overlay_string): Totalize sizes assuming
Richard M. Stallman <rms@gnu.org>
parents: 20538
diff changeset
3103 int nbytes;
12697
9ebf33d6d07c (struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents: 12538
diff changeset
3104 tem = overlay_heads.buf[i].string;
46370
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46293
diff changeset
3105 nbytes = copy_text (SDATA (tem), p,
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46293
diff changeset
3106 SBYTES (tem),
20586
90d6a75210d6 (record_overlay_string): Totalize sizes assuming
Richard M. Stallman <rms@gnu.org>
parents: 20538
diff changeset
3107 STRING_MULTIBYTE (tem), multibyte);
90d6a75210d6 (record_overlay_string): Totalize sizes assuming
Richard M. Stallman <rms@gnu.org>
parents: 20538
diff changeset
3108 p += nbytes;
12699
d0f4113de2ea (record_overlay_string, overlay_strings): Handle zero-sized overlays better.
Karl Heuer <kwzh@gnu.org>
parents: 12697
diff changeset
3109 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
3110 if (STRINGP (tem))
d0f4113de2ea (record_overlay_string, overlay_strings): Handle zero-sized overlays better.
Karl Heuer <kwzh@gnu.org>
parents: 12697
diff changeset
3111 {
46370
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46293
diff changeset
3112 nbytes = copy_text (SDATA (tem), p,
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46293
diff changeset
3113 SBYTES (tem),
20586
90d6a75210d6 (record_overlay_string): Totalize sizes assuming
Richard M. Stallman <rms@gnu.org>
parents: 20538
diff changeset
3114 STRING_MULTIBYTE (tem), multibyte);
90d6a75210d6 (record_overlay_string): Totalize sizes assuming
Richard M. Stallman <rms@gnu.org>
parents: 20538
diff changeset
3115 p += nbytes;
12699
d0f4113de2ea (record_overlay_string, overlay_strings): Handle zero-sized overlays better.
Karl Heuer <kwzh@gnu.org>
parents: 12697
diff changeset
3116 }
11693
efef31f1c42d (Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents: 11659
diff changeset
3117 }
12699
d0f4113de2ea (record_overlay_string, overlay_strings): Handle zero-sized overlays better.
Karl Heuer <kwzh@gnu.org>
parents: 12697
diff changeset
3118 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
3119 abort ();
11693
efef31f1c42d (Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents: 11659
diff changeset
3120 if (pstr)
efef31f1c42d (Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents: 11659
diff changeset
3121 *pstr = overlay_str_buf;
12697
9ebf33d6d07c (struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents: 12538
diff changeset
3122 return total;
11693
efef31f1c42d (Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents: 11659
diff changeset
3123 }
12697
9ebf33d6d07c (struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents: 12538
diff changeset
3124 return 0;
11693
efef31f1c42d (Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents: 11659
diff changeset
3125 }
efef31f1c42d (Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents: 11659
diff changeset
3126
2508
3aa2f3b35353 * buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents: 2486
diff changeset
3127 /* 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
3128
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3129 void
2508
3aa2f3b35353 * buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents: 2486
diff changeset
3130 recenter_overlay_lists (buf, pos)
3aa2f3b35353 * buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents: 2486
diff changeset
3131 struct buffer *buf;
51824
9f5665eb77bd (reset_buffer, recenter_overlay_lists)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51782
diff changeset
3132 EMACS_INT pos;
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3133 {
51844
c5036e7cc93b (overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51827
diff changeset
3134 Lisp_Object overlay, beg, end;
c5036e7cc93b (overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51827
diff changeset
3135 struct Lisp_Overlay *prev, *tail, *next;
2389
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 /* 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
3138
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3139 /* 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
3140 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
3141 with some future change. */
51844
c5036e7cc93b (overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51827
diff changeset
3142 prev = NULL;
c5036e7cc93b (overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51827
diff changeset
3143 for (tail = buf->overlays_before; tail; prev = tail, tail = next)
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3144 {
51844
c5036e7cc93b (overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51827
diff changeset
3145 next = tail->next;
c5036e7cc93b (overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51827
diff changeset
3146 XSETMISC (overlay, tail);
2389
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 /* 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
3149 if (!OVERLAY_VALID (overlay))
2776
8bf3bb4c20dd * lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents: 2722
diff changeset
3150 #if 1
8bf3bb4c20dd * lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents: 2722
diff changeset
3151 abort ();
8bf3bb4c20dd * lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents: 2722
diff changeset
3152 #else
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3153 {
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3154 /* 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
3155 if (!NILP (prev))
26164
d39ec0a27081 more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents: 26088
diff changeset
3156 XCDR (prev) = next;
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3157 else
2508
3aa2f3b35353 * buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents: 2486
diff changeset
3158 buf->overlays_before = next;
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3159 tail = prev;
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3160 continue;
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3161 }
2776
8bf3bb4c20dd * lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents: 2722
diff changeset
3162 #endif
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3163
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3164 beg = OVERLAY_START (overlay);
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3165 end = OVERLAY_END (overlay);
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3166
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3167 if (OVERLAY_POSITION (end) > pos)
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3168 {
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3169 /* OVERLAY needs to be moved. */
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3170 int where = OVERLAY_POSITION (beg);
51844
c5036e7cc93b (overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51827
diff changeset
3171 struct Lisp_Overlay *other, *other_prev;
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3172
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3173 /* Splice the cons cell TAIL out of overlays_before. */
51844
c5036e7cc93b (overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51827
diff changeset
3174 if (prev)
c5036e7cc93b (overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51827
diff changeset
3175 prev->next = next;
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3176 else
2508
3aa2f3b35353 * buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents: 2486
diff changeset
3177 buf->overlays_before = next;
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3178
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3179 /* Search thru overlays_after for where to put it. */
51844
c5036e7cc93b (overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51827
diff changeset
3180 other_prev = NULL;
c5036e7cc93b (overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51827
diff changeset
3181 for (other = buf->overlays_after; other;
c5036e7cc93b (overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51827
diff changeset
3182 other_prev = other, other = other->next)
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3183 {
25744
8b89b961f7d1 (Fkill_buffer): Remove unused variables.
Gerd Moellmann <gerd@gnu.org>
parents: 25664
diff changeset
3184 Lisp_Object otherbeg, otheroverlay;
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3185
51844
c5036e7cc93b (overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51827
diff changeset
3186 XSETMISC (otheroverlay, other);
c5036e7cc93b (overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51827
diff changeset
3187 eassert (OVERLAY_VALID (otheroverlay));
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3188
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3189 otherbeg = OVERLAY_START (otheroverlay);
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3190 if (OVERLAY_POSITION (otherbeg) >= where)
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3191 break;
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3192 }
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3193
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3194 /* Add TAIL to overlays_after before OTHER. */
51844
c5036e7cc93b (overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51827
diff changeset
3195 tail->next = other;
c5036e7cc93b (overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51827
diff changeset
3196 if (other_prev)
c5036e7cc93b (overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51827
diff changeset
3197 other_prev->next = tail;
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3198 else
2508
3aa2f3b35353 * buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents: 2486
diff changeset
3199 buf->overlays_after = tail;
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3200 tail = prev;
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3201 }
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3202 else
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3203 /* 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
3204 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
3205 so stop now. */
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3206 break;
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3207 }
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3208
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3209 /* See if anything in overlays_after should be in overlays_before. */
51844
c5036e7cc93b (overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51827
diff changeset
3210 prev = NULL;
c5036e7cc93b (overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51827
diff changeset
3211 for (tail = buf->overlays_after; tail; prev = tail, tail = next)
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3212 {
51844
c5036e7cc93b (overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51827
diff changeset
3213 next = tail->next;
c5036e7cc93b (overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51827
diff changeset
3214 XSETMISC (overlay, tail);
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3215
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3216 /* 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
3217 if (!OVERLAY_VALID (overlay))
2776
8bf3bb4c20dd * lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents: 2722
diff changeset
3218 #if 1
8bf3bb4c20dd * lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents: 2722
diff changeset
3219 abort ();
8bf3bb4c20dd * lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents: 2722
diff changeset
3220 #else
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3221 {
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3222 /* 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
3223 if (!NILP (prev))
26164
d39ec0a27081 more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents: 26088
diff changeset
3224 XCDR (prev) = next;
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3225 else
2508
3aa2f3b35353 * buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents: 2486
diff changeset
3226 buf->overlays_after = next;
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3227 tail = prev;
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3228 continue;
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3229 }
2776
8bf3bb4c20dd * lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents: 2722
diff changeset
3230 #endif
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3231
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3232 beg = OVERLAY_START (overlay);
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3233 end = OVERLAY_END (overlay);
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3234
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3235 /* Stop looking, when we know that nothing further
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3236 can possibly end before POS. */
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3237 if (OVERLAY_POSITION (beg) > pos)
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3238 break;
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3239
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3240 if (OVERLAY_POSITION (end) <= pos)
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3241 {
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3242 /* OVERLAY needs to be moved. */
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3243 int where = OVERLAY_POSITION (end);
51844
c5036e7cc93b (overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51827
diff changeset
3244 struct Lisp_Overlay *other, *other_prev;
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3245
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3246 /* Splice the cons cell TAIL out of overlays_after. */
51844
c5036e7cc93b (overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51827
diff changeset
3247 if (prev)
c5036e7cc93b (overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51827
diff changeset
3248 prev->next = next;
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3249 else
2508
3aa2f3b35353 * buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents: 2486
diff changeset
3250 buf->overlays_after = next;
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3251
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3252 /* Search thru overlays_before for where to put it. */
51844
c5036e7cc93b (overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51827
diff changeset
3253 other_prev = NULL;
c5036e7cc93b (overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51827
diff changeset
3254 for (other = buf->overlays_before; other;
c5036e7cc93b (overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51827
diff changeset
3255 other_prev = other, other = other->next)
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3256 {
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3257 Lisp_Object otherend, otheroverlay;
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3258
51844
c5036e7cc93b (overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51827
diff changeset
3259 XSETMISC (otheroverlay, other);
c5036e7cc93b (overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51827
diff changeset
3260 eassert (OVERLAY_VALID (otheroverlay));
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3261
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3262 otherend = OVERLAY_END (otheroverlay);
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3263 if (OVERLAY_POSITION (otherend) <= where)
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3264 break;
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3265 }
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3266
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3267 /* Add TAIL to overlays_before before OTHER. */
51844
c5036e7cc93b (overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51827
diff changeset
3268 tail->next = other;
c5036e7cc93b (overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51827
diff changeset
3269 if (other_prev)
c5036e7cc93b (overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51827
diff changeset
3270 other_prev->next = tail;
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3271 else
2508
3aa2f3b35353 * buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents: 2486
diff changeset
3272 buf->overlays_before = tail;
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3273 tail = prev;
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3274 }
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3275 }
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3276
51824
9f5665eb77bd (reset_buffer, recenter_overlay_lists)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51782
diff changeset
3277 buf->overlay_center = pos;
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3278 }
7520
6cc6328992d6 (fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents: 7492
diff changeset
3279
11473
24ede15e0aaa (adjust_overlays_for_insert): New function.
Karl Heuer <kwzh@gnu.org>
parents: 11418
diff changeset
3280 void
24ede15e0aaa (adjust_overlays_for_insert): New function.
Karl Heuer <kwzh@gnu.org>
parents: 11418
diff changeset
3281 adjust_overlays_for_insert (pos, length)
51824
9f5665eb77bd (reset_buffer, recenter_overlay_lists)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51782
diff changeset
3282 EMACS_INT pos;
9f5665eb77bd (reset_buffer, recenter_overlay_lists)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51782
diff changeset
3283 EMACS_INT length;
11473
24ede15e0aaa (adjust_overlays_for_insert): New function.
Karl Heuer <kwzh@gnu.org>
parents: 11418
diff changeset
3284 {
24ede15e0aaa (adjust_overlays_for_insert): New function.
Karl Heuer <kwzh@gnu.org>
parents: 11418
diff changeset
3285 /* 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
3286 but we may need to update the value of the overlay center. */
51824
9f5665eb77bd (reset_buffer, recenter_overlay_lists)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51782
diff changeset
3287 if (current_buffer->overlay_center >= pos)
9f5665eb77bd (reset_buffer, recenter_overlay_lists)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51782
diff changeset
3288 current_buffer->overlay_center += length;
11473
24ede15e0aaa (adjust_overlays_for_insert): New function.
Karl Heuer <kwzh@gnu.org>
parents: 11418
diff changeset
3289 }
24ede15e0aaa (adjust_overlays_for_insert): New function.
Karl Heuer <kwzh@gnu.org>
parents: 11418
diff changeset
3290
24ede15e0aaa (adjust_overlays_for_insert): New function.
Karl Heuer <kwzh@gnu.org>
parents: 11418
diff changeset
3291 void
24ede15e0aaa (adjust_overlays_for_insert): New function.
Karl Heuer <kwzh@gnu.org>
parents: 11418
diff changeset
3292 adjust_overlays_for_delete (pos, length)
51824
9f5665eb77bd (reset_buffer, recenter_overlay_lists)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51782
diff changeset
3293 EMACS_INT pos;
9f5665eb77bd (reset_buffer, recenter_overlay_lists)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51782
diff changeset
3294 EMACS_INT length;
11473
24ede15e0aaa (adjust_overlays_for_insert): New function.
Karl Heuer <kwzh@gnu.org>
parents: 11418
diff changeset
3295 {
51824
9f5665eb77bd (reset_buffer, recenter_overlay_lists)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51782
diff changeset
3296 if (current_buffer->overlay_center < pos)
11473
24ede15e0aaa (adjust_overlays_for_insert): New function.
Karl Heuer <kwzh@gnu.org>
parents: 11418
diff changeset
3297 /* 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
3298 after-lists are still consistent. */
24ede15e0aaa (adjust_overlays_for_insert): New function.
Karl Heuer <kwzh@gnu.org>
parents: 11418
diff changeset
3299 ;
51824
9f5665eb77bd (reset_buffer, recenter_overlay_lists)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51782
diff changeset
3300 else if (current_buffer->overlay_center > pos + length)
11473
24ede15e0aaa (adjust_overlays_for_insert): New function.
Karl Heuer <kwzh@gnu.org>
parents: 11418
diff changeset
3301 /* 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
3302 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
3303 given the new value. */
51824
9f5665eb77bd (reset_buffer, recenter_overlay_lists)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51782
diff changeset
3304 current_buffer->overlay_center -= length;
11473
24ede15e0aaa (adjust_overlays_for_insert): New function.
Karl Heuer <kwzh@gnu.org>
parents: 11418
diff changeset
3305 else
24ede15e0aaa (adjust_overlays_for_insert): New function.
Karl Heuer <kwzh@gnu.org>
parents: 11418
diff changeset
3306 /* 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
3307 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
3308 and also update the center point. */
24ede15e0aaa (adjust_overlays_for_insert): New function.
Karl Heuer <kwzh@gnu.org>
parents: 11418
diff changeset
3309 recenter_overlay_lists (current_buffer, pos);
24ede15e0aaa (adjust_overlays_for_insert): New function.
Karl Heuer <kwzh@gnu.org>
parents: 11418
diff changeset
3310 }
24ede15e0aaa (adjust_overlays_for_insert): New function.
Karl Heuer <kwzh@gnu.org>
parents: 11418
diff changeset
3311
7520
6cc6328992d6 (fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents: 7492
diff changeset
3312 /* 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
3313 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
3314 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
3315 list and reinserted in its proper place.
6cc6328992d6 (fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents: 7492
diff changeset
3316 Such an overlay might even have negative size at this point.
54772
956112814473 (fix_start_end_in_overlays): make overlays empty if they are backwards.
Masatake YAMATO <jet@gyve.org>
parents: 54555
diff changeset
3317 If so, we'll make the overlay empty. */
7520
6cc6328992d6 (fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents: 7492
diff changeset
3318 void
54555
b136a4512609 * insdel.c (adjust_markers_for_insert): Call fix_start_end_in_overlays.
Masatake YAMATO <jet@gyve.org>
parents: 54266
diff changeset
3319 fix_start_end_in_overlays (start, end)
7520
6cc6328992d6 (fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents: 7492
diff changeset
3320 register int start, end;
6cc6328992d6 (fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents: 7492
diff changeset
3321 {
25744
8b89b961f7d1 (Fkill_buffer): Remove unused variables.
Gerd Moellmann <gerd@gnu.org>
parents: 25664
diff changeset
3322 Lisp_Object overlay;
51844
c5036e7cc93b (overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51827
diff changeset
3323 struct Lisp_Overlay *before_list, *after_list;
45374
030fb28e7ec2 * buffer.c (fix_overlays_in_range, fix_overlays_before): Don't take the address
Ken Raeburn <raeburn@raeburn.org>
parents: 44790
diff changeset
3324 /* These are either nil, indicating that before_list or after_list
030fb28e7ec2 * buffer.c (fix_overlays_in_range, fix_overlays_before): Don't take the address
Ken Raeburn <raeburn@raeburn.org>
parents: 44790
diff changeset
3325 should be assigned, or the cons cell the cdr of which should be
030fb28e7ec2 * buffer.c (fix_overlays_in_range, fix_overlays_before): Don't take the address
Ken Raeburn <raeburn@raeburn.org>
parents: 44790
diff changeset
3326 assigned. */
51844
c5036e7cc93b (overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51827
diff changeset
3327 struct Lisp_Overlay *beforep = NULL, *afterp = NULL;
45374
030fb28e7ec2 * buffer.c (fix_overlays_in_range, fix_overlays_before): Don't take the address
Ken Raeburn <raeburn@raeburn.org>
parents: 44790
diff changeset
3328 /* 'Parent', likewise, indicates a cons cell or
030fb28e7ec2 * buffer.c (fix_overlays_in_range, fix_overlays_before): Don't take the address
Ken Raeburn <raeburn@raeburn.org>
parents: 44790
diff changeset
3329 current_buffer->overlays_before or overlays_after, depending
030fb28e7ec2 * buffer.c (fix_overlays_in_range, fix_overlays_before): Don't take the address
Ken Raeburn <raeburn@raeburn.org>
parents: 44790
diff changeset
3330 which loop we're in. */
51844
c5036e7cc93b (overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51827
diff changeset
3331 struct Lisp_Overlay *tail, *parent;
7520
6cc6328992d6 (fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents: 7492
diff changeset
3332 int startpos, endpos;
6cc6328992d6 (fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents: 7492
diff changeset
3333
6cc6328992d6 (fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents: 7492
diff changeset
3334 /* 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
3335 The loop invariant is that before_list (resp. after_list) is a
45374
030fb28e7ec2 * buffer.c (fix_overlays_in_range, fix_overlays_before): Don't take the address
Ken Raeburn <raeburn@raeburn.org>
parents: 44790
diff changeset
3336 well-formed list except that its last element, the CDR of beforep
030fb28e7ec2 * buffer.c (fix_overlays_in_range, fix_overlays_before): Don't take the address
Ken Raeburn <raeburn@raeburn.org>
parents: 44790
diff changeset
3337 (resp. afterp) if beforep (afterp) isn't nil or before_list
030fb28e7ec2 * buffer.c (fix_overlays_in_range, fix_overlays_before): Don't take the address
Ken Raeburn <raeburn@raeburn.org>
parents: 44790
diff changeset
3338 (after_list) if it is, is still uninitialized. So it's not a bug
030fb28e7ec2 * buffer.c (fix_overlays_in_range, fix_overlays_before): Don't take the address
Ken Raeburn <raeburn@raeburn.org>
parents: 44790
diff changeset
3339 that before_list isn't initialized, although it may look
030fb28e7ec2 * buffer.c (fix_overlays_in_range, fix_overlays_before): Don't take the address
Ken Raeburn <raeburn@raeburn.org>
parents: 44790
diff changeset
3340 strange. */
51844
c5036e7cc93b (overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51827
diff changeset
3341 for (parent = NULL, tail = current_buffer->overlays_before; tail;)
7520
6cc6328992d6 (fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents: 7492
diff changeset
3342 {
51844
c5036e7cc93b (overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51827
diff changeset
3343 XSETMISC (overlay, tail);
54772
956112814473 (fix_start_end_in_overlays): make overlays empty if they are backwards.
Masatake YAMATO <jet@gyve.org>
parents: 54555
diff changeset
3344
7520
6cc6328992d6 (fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents: 7492
diff changeset
3345 endpos = OVERLAY_POSITION (OVERLAY_END (overlay));
54772
956112814473 (fix_start_end_in_overlays): make overlays empty if they are backwards.
Masatake YAMATO <jet@gyve.org>
parents: 54555
diff changeset
3346 startpos = OVERLAY_POSITION (OVERLAY_START (overlay));
956112814473 (fix_start_end_in_overlays): make overlays empty if they are backwards.
Masatake YAMATO <jet@gyve.org>
parents: 54555
diff changeset
3347
956112814473 (fix_start_end_in_overlays): make overlays empty if they are backwards.
Masatake YAMATO <jet@gyve.org>
parents: 54555
diff changeset
3348 /* If the overlay is backwards, make it empty. */
956112814473 (fix_start_end_in_overlays): make overlays empty if they are backwards.
Masatake YAMATO <jet@gyve.org>
parents: 54555
diff changeset
3349 if (endpos < startpos)
956112814473 (fix_start_end_in_overlays): make overlays empty if they are backwards.
Masatake YAMATO <jet@gyve.org>
parents: 54555
diff changeset
3350 {
956112814473 (fix_start_end_in_overlays): make overlays empty if they are backwards.
Masatake YAMATO <jet@gyve.org>
parents: 54555
diff changeset
3351 startpos = endpos;
956112814473 (fix_start_end_in_overlays): make overlays empty if they are backwards.
Masatake YAMATO <jet@gyve.org>
parents: 54555
diff changeset
3352 Fset_marker (OVERLAY_START (overlay), make_number (startpos),
956112814473 (fix_start_end_in_overlays): make overlays empty if they are backwards.
Masatake YAMATO <jet@gyve.org>
parents: 54555
diff changeset
3353 Qnil);
956112814473 (fix_start_end_in_overlays): make overlays empty if they are backwards.
Masatake YAMATO <jet@gyve.org>
parents: 54555
diff changeset
3354 }
956112814473 (fix_start_end_in_overlays): make overlays empty if they are backwards.
Masatake YAMATO <jet@gyve.org>
parents: 54555
diff changeset
3355
7520
6cc6328992d6 (fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents: 7492
diff changeset
3356 if (endpos < start)
6cc6328992d6 (fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents: 7492
diff changeset
3357 break;
55242
d57364949309 (syms_of_buffer) <line-spacing>: Allow float value.
Kim F. Storm <storm@cua.dk>
parents: 55140
diff changeset
3358
7520
6cc6328992d6 (fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents: 7492
diff changeset
3359 if (endpos < end
6cc6328992d6 (fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents: 7492
diff changeset
3360 || (startpos >= start && startpos < end))
6cc6328992d6 (fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents: 7492
diff changeset
3361 {
6cc6328992d6 (fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents: 7492
diff changeset
3362 /* 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
3363 recenter_overlay_lists will move it to the right place. */
51824
9f5665eb77bd (reset_buffer, recenter_overlay_lists)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51782
diff changeset
3364 if (endpos < current_buffer->overlay_center)
7520
6cc6328992d6 (fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents: 7492
diff changeset
3365 {
51844
c5036e7cc93b (overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51827
diff changeset
3366 if (!afterp)
45374
030fb28e7ec2 * buffer.c (fix_overlays_in_range, fix_overlays_before): Don't take the address
Ken Raeburn <raeburn@raeburn.org>
parents: 44790
diff changeset
3367 after_list = tail;
030fb28e7ec2 * buffer.c (fix_overlays_in_range, fix_overlays_before): Don't take the address
Ken Raeburn <raeburn@raeburn.org>
parents: 44790
diff changeset
3368 else
51844
c5036e7cc93b (overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51827
diff changeset
3369 afterp->next = tail;
45374
030fb28e7ec2 * buffer.c (fix_overlays_in_range, fix_overlays_before): Don't take the address
Ken Raeburn <raeburn@raeburn.org>
parents: 44790
diff changeset
3370 afterp = tail;
7520
6cc6328992d6 (fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents: 7492
diff changeset
3371 }
6cc6328992d6 (fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents: 7492
diff changeset
3372 else
6cc6328992d6 (fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents: 7492
diff changeset
3373 {
51844
c5036e7cc93b (overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51827
diff changeset
3374 if (!beforep)
45374
030fb28e7ec2 * buffer.c (fix_overlays_in_range, fix_overlays_before): Don't take the address
Ken Raeburn <raeburn@raeburn.org>
parents: 44790
diff changeset
3375 before_list = tail;
030fb28e7ec2 * buffer.c (fix_overlays_in_range, fix_overlays_before): Don't take the address
Ken Raeburn <raeburn@raeburn.org>
parents: 44790
diff changeset
3376 else
51844
c5036e7cc93b (overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51827
diff changeset
3377 beforep->next = tail;
45374
030fb28e7ec2 * buffer.c (fix_overlays_in_range, fix_overlays_before): Don't take the address
Ken Raeburn <raeburn@raeburn.org>
parents: 44790
diff changeset
3378 beforep = tail;
7520
6cc6328992d6 (fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents: 7492
diff changeset
3379 }
51844
c5036e7cc93b (overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51827
diff changeset
3380 if (!parent)
c5036e7cc93b (overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51827
diff changeset
3381 current_buffer->overlays_before = tail->next;
45374
030fb28e7ec2 * buffer.c (fix_overlays_in_range, fix_overlays_before): Don't take the address
Ken Raeburn <raeburn@raeburn.org>
parents: 44790
diff changeset
3382 else
51844
c5036e7cc93b (overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51827
diff changeset
3383 parent->next = tail->next;
c5036e7cc93b (overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51827
diff changeset
3384 tail = tail->next;
7520
6cc6328992d6 (fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents: 7492
diff changeset
3385 }
6cc6328992d6 (fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents: 7492
diff changeset
3386 else
51844
c5036e7cc93b (overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51827
diff changeset
3387 parent = tail, tail = parent->next;
7520
6cc6328992d6 (fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents: 7492
diff changeset
3388 }
51844
c5036e7cc93b (overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51827
diff changeset
3389 for (parent = NULL, tail = current_buffer->overlays_after; tail;)
7520
6cc6328992d6 (fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents: 7492
diff changeset
3390 {
51844
c5036e7cc93b (overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51827
diff changeset
3391 XSETMISC (overlay, tail);
54772
956112814473 (fix_start_end_in_overlays): make overlays empty if they are backwards.
Masatake YAMATO <jet@gyve.org>
parents: 54555
diff changeset
3392
7520
6cc6328992d6 (fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents: 7492
diff changeset
3393 startpos = OVERLAY_POSITION (OVERLAY_START (overlay));
54772
956112814473 (fix_start_end_in_overlays): make overlays empty if they are backwards.
Masatake YAMATO <jet@gyve.org>
parents: 54555
diff changeset
3394 endpos = OVERLAY_POSITION (OVERLAY_END (overlay));
956112814473 (fix_start_end_in_overlays): make overlays empty if they are backwards.
Masatake YAMATO <jet@gyve.org>
parents: 54555
diff changeset
3395
956112814473 (fix_start_end_in_overlays): make overlays empty if they are backwards.
Masatake YAMATO <jet@gyve.org>
parents: 54555
diff changeset
3396 /* If the overlay is backwards, make it empty. */
956112814473 (fix_start_end_in_overlays): make overlays empty if they are backwards.
Masatake YAMATO <jet@gyve.org>
parents: 54555
diff changeset
3397 if (endpos < startpos)
956112814473 (fix_start_end_in_overlays): make overlays empty if they are backwards.
Masatake YAMATO <jet@gyve.org>
parents: 54555
diff changeset
3398 {
956112814473 (fix_start_end_in_overlays): make overlays empty if they are backwards.
Masatake YAMATO <jet@gyve.org>
parents: 54555
diff changeset
3399 startpos = endpos;
956112814473 (fix_start_end_in_overlays): make overlays empty if they are backwards.
Masatake YAMATO <jet@gyve.org>
parents: 54555
diff changeset
3400 Fset_marker (OVERLAY_START (overlay), make_number (startpos),
55242
d57364949309 (syms_of_buffer) <line-spacing>: Allow float value.
Kim F. Storm <storm@cua.dk>
parents: 55140
diff changeset
3401 Qnil);
54772
956112814473 (fix_start_end_in_overlays): make overlays empty if they are backwards.
Masatake YAMATO <jet@gyve.org>
parents: 54555
diff changeset
3402 }
956112814473 (fix_start_end_in_overlays): make overlays empty if they are backwards.
Masatake YAMATO <jet@gyve.org>
parents: 54555
diff changeset
3403
7520
6cc6328992d6 (fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents: 7492
diff changeset
3404 if (startpos >= end)
6cc6328992d6 (fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents: 7492
diff changeset
3405 break;
54772
956112814473 (fix_start_end_in_overlays): make overlays empty if they are backwards.
Masatake YAMATO <jet@gyve.org>
parents: 54555
diff changeset
3406
7520
6cc6328992d6 (fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents: 7492
diff changeset
3407 if (startpos >= start
6cc6328992d6 (fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents: 7492
diff changeset
3408 || (endpos >= start && endpos < end))
6cc6328992d6 (fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents: 7492
diff changeset
3409 {
51824
9f5665eb77bd (reset_buffer, recenter_overlay_lists)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51782
diff changeset
3410 if (endpos < current_buffer->overlay_center)
7520
6cc6328992d6 (fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents: 7492
diff changeset
3411 {
51844
c5036e7cc93b (overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51827
diff changeset
3412 if (!afterp)
45374
030fb28e7ec2 * buffer.c (fix_overlays_in_range, fix_overlays_before): Don't take the address
Ken Raeburn <raeburn@raeburn.org>
parents: 44790
diff changeset
3413 after_list = tail;
030fb28e7ec2 * buffer.c (fix_overlays_in_range, fix_overlays_before): Don't take the address
Ken Raeburn <raeburn@raeburn.org>
parents: 44790
diff changeset
3414 else
51844
c5036e7cc93b (overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51827
diff changeset
3415 afterp->next = tail;
45374
030fb28e7ec2 * buffer.c (fix_overlays_in_range, fix_overlays_before): Don't take the address
Ken Raeburn <raeburn@raeburn.org>
parents: 44790
diff changeset
3416 afterp = tail;
7520
6cc6328992d6 (fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents: 7492
diff changeset
3417 }
6cc6328992d6 (fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents: 7492
diff changeset
3418 else
6cc6328992d6 (fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents: 7492
diff changeset
3419 {
51844
c5036e7cc93b (overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51827
diff changeset
3420 if (!beforep)
45374
030fb28e7ec2 * buffer.c (fix_overlays_in_range, fix_overlays_before): Don't take the address
Ken Raeburn <raeburn@raeburn.org>
parents: 44790
diff changeset
3421 before_list = tail;
030fb28e7ec2 * buffer.c (fix_overlays_in_range, fix_overlays_before): Don't take the address
Ken Raeburn <raeburn@raeburn.org>
parents: 44790
diff changeset
3422 else
51844
c5036e7cc93b (overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51827
diff changeset
3423 beforep->next = tail;
45374
030fb28e7ec2 * buffer.c (fix_overlays_in_range, fix_overlays_before): Don't take the address
Ken Raeburn <raeburn@raeburn.org>
parents: 44790
diff changeset
3424 beforep = tail;
7520
6cc6328992d6 (fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents: 7492
diff changeset
3425 }
51844
c5036e7cc93b (overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51827
diff changeset
3426 if (!parent)
c5036e7cc93b (overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51827
diff changeset
3427 current_buffer->overlays_after = tail->next;
45374
030fb28e7ec2 * buffer.c (fix_overlays_in_range, fix_overlays_before): Don't take the address
Ken Raeburn <raeburn@raeburn.org>
parents: 44790
diff changeset
3428 else
51844
c5036e7cc93b (overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51827
diff changeset
3429 parent->next = tail->next;
c5036e7cc93b (overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51827
diff changeset
3430 tail = tail->next;
7520
6cc6328992d6 (fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents: 7492
diff changeset
3431 }
6cc6328992d6 (fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents: 7492
diff changeset
3432 else
51844
c5036e7cc93b (overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51827
diff changeset
3433 parent = tail, tail = parent->next;
7520
6cc6328992d6 (fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents: 7492
diff changeset
3434 }
6cc6328992d6 (fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents: 7492
diff changeset
3435
6cc6328992d6 (fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents: 7492
diff changeset
3436 /* 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
3437 and let the recenter function make it sane again. */
51844
c5036e7cc93b (overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51827
diff changeset
3438 if (beforep)
45374
030fb28e7ec2 * buffer.c (fix_overlays_in_range, fix_overlays_before): Don't take the address
Ken Raeburn <raeburn@raeburn.org>
parents: 44790
diff changeset
3439 {
51844
c5036e7cc93b (overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51827
diff changeset
3440 beforep->next = current_buffer->overlays_before;
45374
030fb28e7ec2 * buffer.c (fix_overlays_in_range, fix_overlays_before): Don't take the address
Ken Raeburn <raeburn@raeburn.org>
parents: 44790
diff changeset
3441 current_buffer->overlays_before = before_list;
030fb28e7ec2 * buffer.c (fix_overlays_in_range, fix_overlays_before): Don't take the address
Ken Raeburn <raeburn@raeburn.org>
parents: 44790
diff changeset
3442 }
51824
9f5665eb77bd (reset_buffer, recenter_overlay_lists)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51782
diff changeset
3443 recenter_overlay_lists (current_buffer, current_buffer->overlay_center);
7520
6cc6328992d6 (fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents: 7492
diff changeset
3444
51844
c5036e7cc93b (overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51827
diff changeset
3445 if (afterp)
45374
030fb28e7ec2 * buffer.c (fix_overlays_in_range, fix_overlays_before): Don't take the address
Ken Raeburn <raeburn@raeburn.org>
parents: 44790
diff changeset
3446 {
51844
c5036e7cc93b (overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51827
diff changeset
3447 afterp->next = current_buffer->overlays_after;
45374
030fb28e7ec2 * buffer.c (fix_overlays_in_range, fix_overlays_before): Don't take the address
Ken Raeburn <raeburn@raeburn.org>
parents: 44790
diff changeset
3448 current_buffer->overlays_after = after_list;
030fb28e7ec2 * buffer.c (fix_overlays_in_range, fix_overlays_before): Don't take the address
Ken Raeburn <raeburn@raeburn.org>
parents: 44790
diff changeset
3449 }
51824
9f5665eb77bd (reset_buffer, recenter_overlay_lists)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51782
diff changeset
3450 recenter_overlay_lists (current_buffer, current_buffer->overlay_center);
7520
6cc6328992d6 (fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents: 7492
diff changeset
3451 }
17022
907fb167f7de Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16840
diff changeset
3452
907fb167f7de Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16840
diff changeset
3453 /* 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
3454 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
3455 ending marker is before-insertion-marker. When `overlays_before'
907fb167f7de Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16840
diff changeset
3456 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
3457 order and both overlays end at inserting position, inserting a text
907fb167f7de Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16840
diff changeset
3458 increases only the ending marker of the latter type, which results
907fb167f7de Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16840
diff changeset
3459 in incorrect ordering of `overlays_before'.
907fb167f7de Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16840
diff changeset
3460
907fb167f7de Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16840
diff changeset
3461 This function fixes ordering of overlays in the slot
907fb167f7de Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16840
diff changeset
3462 `overlays_before' of the buffer *BP. Before the insertion, `point'
907fb167f7de Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16840
diff changeset
3463 was at PREV, and now is at POS. */
907fb167f7de Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16840
diff changeset
3464
20368
9f5fab56f4b3 (nsberror, record_buffer, validate_region,
Kenichi Handa <handa@m17n.org>
parents: 20186
diff changeset
3465 void
17022
907fb167f7de Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16840
diff changeset
3466 fix_overlays_before (bp, prev, pos)
907fb167f7de Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16840
diff changeset
3467 struct buffer *bp;
51824
9f5665eb77bd (reset_buffer, recenter_overlay_lists)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51782
diff changeset
3468 EMACS_INT prev, pos;
17022
907fb167f7de Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16840
diff changeset
3469 {
51844
c5036e7cc93b (overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51827
diff changeset
3470 /* If parent is nil, replace overlays_before; otherwise, parent->next. */
c5036e7cc93b (overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51827
diff changeset
3471 struct Lisp_Overlay *tail = bp->overlays_before, *parent = NULL, *right_pair;
c5036e7cc93b (overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51827
diff changeset
3472 Lisp_Object tem;
51824
9f5665eb77bd (reset_buffer, recenter_overlay_lists)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51782
diff changeset
3473 EMACS_INT end;
17022
907fb167f7de Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16840
diff changeset
3474
907fb167f7de Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16840
diff changeset
3475 /* After the insertion, the several overlays may be in incorrect
907fb167f7de Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16840
diff changeset
3476 order. The possibility is that, in the list `overlays_before',
907fb167f7de Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16840
diff changeset
3477 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
3478 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
3479 ordering of these overlays, by moving overlays ends at POS before
907fb167f7de Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16840
diff changeset
3480 the overlays ends at PREV. */
907fb167f7de Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16840
diff changeset
3481
907fb167f7de Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16840
diff changeset
3482 /* At first, find a place where disordered overlays should be linked
907fb167f7de Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16840
diff changeset
3483 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
3484 overlay whose ending marker is after-insertion-marker if disorder
907fb167f7de Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16840
diff changeset
3485 exists). */
51844
c5036e7cc93b (overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51827
diff changeset
3486 while (tail
c5036e7cc93b (overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51827
diff changeset
3487 && (XSETMISC (tem, tail),
c5036e7cc93b (overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51827
diff changeset
3488 (end = OVERLAY_POSITION (OVERLAY_END (tem))) >= pos))
45374
030fb28e7ec2 * buffer.c (fix_overlays_in_range, fix_overlays_before): Don't take the address
Ken Raeburn <raeburn@raeburn.org>
parents: 44790
diff changeset
3489 {
030fb28e7ec2 * buffer.c (fix_overlays_in_range, fix_overlays_before): Don't take the address
Ken Raeburn <raeburn@raeburn.org>
parents: 44790
diff changeset
3490 parent = tail;
51844
c5036e7cc93b (overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51827
diff changeset
3491 tail = tail->next;
45374
030fb28e7ec2 * buffer.c (fix_overlays_in_range, fix_overlays_before): Don't take the address
Ken Raeburn <raeburn@raeburn.org>
parents: 44790
diff changeset
3492 }
17022
907fb167f7de Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16840
diff changeset
3493
907fb167f7de Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16840
diff changeset
3494 /* If we don't find such an overlay,
907fb167f7de Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16840
diff changeset
3495 or the found one ends before PREV,
907fb167f7de Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16840
diff changeset
3496 or the found one is the last one in the list,
907fb167f7de Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16840
diff changeset
3497 we don't have to fix anything. */
51853
fd71e1aaa838 (fix_overlays_before): Fix typo in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51844
diff changeset
3498 if (!tail || end < prev || !tail->next)
17022
907fb167f7de Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16840
diff changeset
3499 return;
907fb167f7de Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16840
diff changeset
3500
45374
030fb28e7ec2 * buffer.c (fix_overlays_in_range, fix_overlays_before): Don't take the address
Ken Raeburn <raeburn@raeburn.org>
parents: 44790
diff changeset
3501 right_pair = parent;
030fb28e7ec2 * buffer.c (fix_overlays_in_range, fix_overlays_before): Don't take the address
Ken Raeburn <raeburn@raeburn.org>
parents: 44790
diff changeset
3502 parent = tail;
51844
c5036e7cc93b (overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51827
diff changeset
3503 tail = tail->next;
45374
030fb28e7ec2 * buffer.c (fix_overlays_in_range, fix_overlays_before): Don't take the address
Ken Raeburn <raeburn@raeburn.org>
parents: 44790
diff changeset
3504
030fb28e7ec2 * buffer.c (fix_overlays_in_range, fix_overlays_before): Don't take the address
Ken Raeburn <raeburn@raeburn.org>
parents: 44790
diff changeset
3505 /* Now, end position of overlays in the list TAIL should be before
17022
907fb167f7de Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16840
diff changeset
3506 or equal to PREV. In the loop, an overlay which ends at POS is
45374
030fb28e7ec2 * buffer.c (fix_overlays_in_range, fix_overlays_before): Don't take the address
Ken Raeburn <raeburn@raeburn.org>
parents: 44790
diff changeset
3507 moved ahead to the place indicated by the CDR of RIGHT_PAIR. If
030fb28e7ec2 * buffer.c (fix_overlays_in_range, fix_overlays_before): Don't take the address
Ken Raeburn <raeburn@raeburn.org>
parents: 44790
diff changeset
3508 we found an overlay which ends before PREV, the remaining
030fb28e7ec2 * buffer.c (fix_overlays_in_range, fix_overlays_before): Don't take the address
Ken Raeburn <raeburn@raeburn.org>
parents: 44790
diff changeset
3509 overlays are in correct order. */
51844
c5036e7cc93b (overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51827
diff changeset
3510 while (tail)
17022
907fb167f7de Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16840
diff changeset
3511 {
51844
c5036e7cc93b (overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51827
diff changeset
3512 XSETMISC (tem, tail);
c5036e7cc93b (overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51827
diff changeset
3513 end = OVERLAY_POSITION (OVERLAY_END (tem));
17022
907fb167f7de Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16840
diff changeset
3514
907fb167f7de Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16840
diff changeset
3515 if (end == pos)
907fb167f7de Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16840
diff changeset
3516 { /* This overlay is disordered. */
51844
c5036e7cc93b (overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51827
diff changeset
3517 struct Lisp_Overlay *found = tail;
17022
907fb167f7de Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16840
diff changeset
3518
907fb167f7de Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16840
diff changeset
3519 /* Unlink the found overlay. */
51844
c5036e7cc93b (overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51827
diff changeset
3520 tail = found->next;
c5036e7cc93b (overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51827
diff changeset
3521 parent->next = tail;
45374
030fb28e7ec2 * buffer.c (fix_overlays_in_range, fix_overlays_before): Don't take the address
Ken Raeburn <raeburn@raeburn.org>
parents: 44790
diff changeset
3522 /* Move an overlay at RIGHT_PLACE to the next of the found one,
030fb28e7ec2 * buffer.c (fix_overlays_in_range, fix_overlays_before): Don't take the address
Ken Raeburn <raeburn@raeburn.org>
parents: 44790
diff changeset
3523 and link it into the right place. */
51844
c5036e7cc93b (overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51827
diff changeset
3524 if (!right_pair)
45374
030fb28e7ec2 * buffer.c (fix_overlays_in_range, fix_overlays_before): Don't take the address
Ken Raeburn <raeburn@raeburn.org>
parents: 44790
diff changeset
3525 {
51844
c5036e7cc93b (overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51827
diff changeset
3526 found->next = bp->overlays_before;
45374
030fb28e7ec2 * buffer.c (fix_overlays_in_range, fix_overlays_before): Don't take the address
Ken Raeburn <raeburn@raeburn.org>
parents: 44790
diff changeset
3527 bp->overlays_before = found;
030fb28e7ec2 * buffer.c (fix_overlays_in_range, fix_overlays_before): Don't take the address
Ken Raeburn <raeburn@raeburn.org>
parents: 44790
diff changeset
3528 }
030fb28e7ec2 * buffer.c (fix_overlays_in_range, fix_overlays_before): Don't take the address
Ken Raeburn <raeburn@raeburn.org>
parents: 44790
diff changeset
3529 else
030fb28e7ec2 * buffer.c (fix_overlays_in_range, fix_overlays_before): Don't take the address
Ken Raeburn <raeburn@raeburn.org>
parents: 44790
diff changeset
3530 {
51844
c5036e7cc93b (overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51827
diff changeset
3531 found->next = right_pair->next;
c5036e7cc93b (overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51827
diff changeset
3532 right_pair->next = found;
45374
030fb28e7ec2 * buffer.c (fix_overlays_in_range, fix_overlays_before): Don't take the address
Ken Raeburn <raeburn@raeburn.org>
parents: 44790
diff changeset
3533 }
17022
907fb167f7de Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16840
diff changeset
3534 }
907fb167f7de Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16840
diff changeset
3535 else if (end == prev)
45374
030fb28e7ec2 * buffer.c (fix_overlays_in_range, fix_overlays_before): Don't take the address
Ken Raeburn <raeburn@raeburn.org>
parents: 44790
diff changeset
3536 {
030fb28e7ec2 * buffer.c (fix_overlays_in_range, fix_overlays_before): Don't take the address
Ken Raeburn <raeburn@raeburn.org>
parents: 44790
diff changeset
3537 parent = tail;
51844
c5036e7cc93b (overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51827
diff changeset
3538 tail = tail->next;
45374
030fb28e7ec2 * buffer.c (fix_overlays_in_range, fix_overlays_before): Don't take the address
Ken Raeburn <raeburn@raeburn.org>
parents: 44790
diff changeset
3539 }
17022
907fb167f7de Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16840
diff changeset
3540 else /* No more disordered overlay. */
907fb167f7de Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16840
diff changeset
3541 break;
907fb167f7de Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16840
diff changeset
3542 }
907fb167f7de Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16840
diff changeset
3543 }
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3544
2776
8bf3bb4c20dd * lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents: 2722
diff changeset
3545 DEFUN ("overlayp", Foverlayp, Soverlayp, 1, 1, 0,
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39974
diff changeset
3546 doc: /* Return t if OBJECT is an overlay. */)
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39974
diff changeset
3547 (object)
2776
8bf3bb4c20dd * lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents: 2722
diff changeset
3548 Lisp_Object object;
8bf3bb4c20dd * lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents: 2722
diff changeset
3549 {
8bf3bb4c20dd * lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents: 2722
diff changeset
3550 return (OVERLAYP (object) ? Qt : Qnil);
8bf3bb4c20dd * lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents: 2722
diff changeset
3551 }
8bf3bb4c20dd * lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents: 2722
diff changeset
3552
13446
005d7ed9d69b (Fmake_overlay): New args front-advance and rear-advance.
Richard M. Stallman <rms@gnu.org>
parents: 13270
diff changeset
3553 DEFUN ("make-overlay", Fmake_overlay, Smake_overlay, 2, 5, 0,
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39974
diff changeset
3554 doc: /* Create a new overlay with range BEG to END in BUFFER.
39971
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
3555 If omitted, BUFFER defaults to the current buffer.
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
3556 BEG and END may be integers or markers.
64412
a1807609d4c2 (Fmake_overlay): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 64084
diff changeset
3557 The fourth arg FRONT-ADVANCE, if non-nil, makes the marker
a1807609d4c2 (Fmake_overlay): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 64084
diff changeset
3558 for the front of the overlay advance when text is inserted there
a1807609d4c2 (Fmake_overlay): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 64084
diff changeset
3559 (which means the text *is not* included in the overlay).
a1807609d4c2 (Fmake_overlay): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 64084
diff changeset
3560 The fifth arg REAR-ADVANCE, if non-nil, makes the marker
a1807609d4c2 (Fmake_overlay): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 64084
diff changeset
3561 for the rear of the overlay advance when text is inserted there
a1807609d4c2 (Fmake_overlay): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 64084
diff changeset
3562 (which means the text *is* included in the overlay). */)
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39974
diff changeset
3563 (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
3564 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
3565 Lisp_Object front_advance, rear_advance;
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3566 {
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3567 Lisp_Object overlay;
2508
3aa2f3b35353 * buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents: 2486
diff changeset
3568 struct buffer *b;
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3569
2508
3aa2f3b35353 * buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents: 2486
diff changeset
3570 if (NILP (buffer))
9262
582534b6e763 (Fget_buffer_create, Frename_buffer, Fbuffer_disable_undo,
Karl Heuer <kwzh@gnu.org>
parents: 9211
diff changeset
3571 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
3572 else
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40605
diff changeset
3573 CHECK_BUFFER (buffer);
3031
5c96dfc52433 * buffer.c (Fmake_overlay): Put beg and end in the
Jim Blandy <jimb@redhat.com>
parents: 2961
diff changeset
3574 if (MARKERP (beg)
5c96dfc52433 * buffer.c (Fmake_overlay): Put beg and end in the
Jim Blandy <jimb@redhat.com>
parents: 2961
diff changeset
3575 && ! 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
3576 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
3577 if (MARKERP (end)
5c96dfc52433 * buffer.c (Fmake_overlay): Put beg and end in the
Jim Blandy <jimb@redhat.com>
parents: 2961
diff changeset
3578 && ! 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
3579 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
3580
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40605
diff changeset
3581 CHECK_NUMBER_COERCE_MARKER (beg);
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40605
diff changeset
3582 CHECK_NUMBER_COERCE_MARKER (end);
3031
5c96dfc52433 * buffer.c (Fmake_overlay): Put beg and end in the
Jim Blandy <jimb@redhat.com>
parents: 2961
diff changeset
3583
5c96dfc52433 * buffer.c (Fmake_overlay): Put beg and end in the
Jim Blandy <jimb@redhat.com>
parents: 2961
diff changeset
3584 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
3585 {
6493
33a461f14903 (sort_overlays, Fmake_overlay): Use assignment, not initialization.
Karl Heuer <kwzh@gnu.org>
parents: 6477
diff changeset
3586 Lisp_Object temp;
33a461f14903 (sort_overlays, Fmake_overlay): Use assignment, not initialization.
Karl Heuer <kwzh@gnu.org>
parents: 6477
diff changeset
3587 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
3588 }
2508
3aa2f3b35353 * buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents: 2486
diff changeset
3589
3aa2f3b35353 * buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents: 2486
diff changeset
3590 b = XBUFFER (buffer);
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3591
3031
5c96dfc52433 * buffer.c (Fmake_overlay): Put beg and end in the
Jim Blandy <jimb@redhat.com>
parents: 2961
diff changeset
3592 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
3593 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
3594
13446
005d7ed9d69b (Fmake_overlay): New args front-advance and rear-advance.
Richard M. Stallman <rms@gnu.org>
parents: 13270
diff changeset
3595 if (!NILP (front_advance))
005d7ed9d69b (Fmake_overlay): New args front-advance and rear-advance.
Richard M. Stallman <rms@gnu.org>
parents: 13270
diff changeset
3596 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
3597 if (!NILP (rear_advance))
005d7ed9d69b (Fmake_overlay): New args front-advance and rear-advance.
Richard M. Stallman <rms@gnu.org>
parents: 13270
diff changeset
3598 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
3599
9922
f653d8aac66a (Fmake_overlay, Foverlay_properties, Foverlay_get, Foverlay_put): Use new
Karl Heuer <kwzh@gnu.org>
parents: 9920
diff changeset
3600 overlay = allocate_misc ();
11244
f3b11dc9014e (Fmake_overlay): Use XMISCTYPE.
Richard M. Stallman <rms@gnu.org>
parents: 11214
diff changeset
3601 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
3602 XOVERLAY (overlay)->start = beg;
f653d8aac66a (Fmake_overlay, Foverlay_properties, Foverlay_get, Foverlay_put): Use new
Karl Heuer <kwzh@gnu.org>
parents: 9920
diff changeset
3603 XOVERLAY (overlay)->end = end;
f653d8aac66a (Fmake_overlay, Foverlay_properties, Foverlay_get, Foverlay_put): Use new
Karl Heuer <kwzh@gnu.org>
parents: 9920
diff changeset
3604 XOVERLAY (overlay)->plist = Qnil;
51844
c5036e7cc93b (overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51827
diff changeset
3605 XOVERLAY (overlay)->next = NULL;
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3606
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49444
diff changeset
3607 /* Put the new overlay on the wrong list. */
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3608 end = OVERLAY_END (overlay);
51824
9f5665eb77bd (reset_buffer, recenter_overlay_lists)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51782
diff changeset
3609 if (OVERLAY_POSITION (end) < b->overlay_center)
51844
c5036e7cc93b (overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51827
diff changeset
3610 {
c5036e7cc93b (overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51827
diff changeset
3611 if (b->overlays_after)
c5036e7cc93b (overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51827
diff changeset
3612 XOVERLAY (overlay)->next = b->overlays_after;
c5036e7cc93b (overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51827
diff changeset
3613 b->overlays_after = XOVERLAY (overlay);
c5036e7cc93b (overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51827
diff changeset
3614 }
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3615 else
51844
c5036e7cc93b (overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51827
diff changeset
3616 {
c5036e7cc93b (overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51827
diff changeset
3617 if (b->overlays_before)
c5036e7cc93b (overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51827
diff changeset
3618 XOVERLAY (overlay)->next = b->overlays_before;
c5036e7cc93b (overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51827
diff changeset
3619 b->overlays_before = XOVERLAY (overlay);
c5036e7cc93b (overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51827
diff changeset
3620 }
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3621
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3622 /* This puts it in the right list, and in the right order. */
51824
9f5665eb77bd (reset_buffer, recenter_overlay_lists)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51782
diff changeset
3623 recenter_overlay_lists (b, b->overlay_center);
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3624
2722
16db9d1af886 Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents: 2645
diff changeset
3625 /* 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
3626 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
3627
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3628 return overlay;
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3629 }
16193
6ff2ef91c618 (modify_overlay): Renamed from redisplay_region
Richard M. Stallman <rms@gnu.org>
parents: 16144
diff changeset
3630
6ff2ef91c618 (modify_overlay): Renamed from redisplay_region
Richard M. Stallman <rms@gnu.org>
parents: 16144
diff changeset
3631 /* 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
3632
6ff2ef91c618 (modify_overlay): Renamed from redisplay_region
Richard M. Stallman <rms@gnu.org>
parents: 16144
diff changeset
3633 static void
6ff2ef91c618 (modify_overlay): Renamed from redisplay_region
Richard M. Stallman <rms@gnu.org>
parents: 16144
diff changeset
3634 modify_overlay (buf, start, end)
6ff2ef91c618 (modify_overlay): Renamed from redisplay_region
Richard M. Stallman <rms@gnu.org>
parents: 16144
diff changeset
3635 struct buffer *buf;
51824
9f5665eb77bd (reset_buffer, recenter_overlay_lists)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51782
diff changeset
3636 EMACS_INT start, end;
16193
6ff2ef91c618 (modify_overlay): Renamed from redisplay_region
Richard M. Stallman <rms@gnu.org>
parents: 16144
diff changeset
3637 {
6ff2ef91c618 (modify_overlay): Renamed from redisplay_region
Richard M. Stallman <rms@gnu.org>
parents: 16144
diff changeset
3638 if (start > end)
6ff2ef91c618 (modify_overlay): Renamed from redisplay_region
Richard M. Stallman <rms@gnu.org>
parents: 16144
diff changeset
3639 {
6ff2ef91c618 (modify_overlay): Renamed from redisplay_region
Richard M. Stallman <rms@gnu.org>
parents: 16144
diff changeset
3640 int temp = start;
39333
7af35736264f (modify_overlay): Don't do nothing if START == END;
Gerd Moellmann <gerd@gnu.org>
parents: 39087
diff changeset
3641 start = end;
7af35736264f (modify_overlay): Don't do nothing if START == END;
Gerd Moellmann <gerd@gnu.org>
parents: 39087
diff changeset
3642 end = temp;
16193
6ff2ef91c618 (modify_overlay): Renamed from redisplay_region
Richard M. Stallman <rms@gnu.org>
parents: 16144
diff changeset
3643 }
6ff2ef91c618 (modify_overlay): Renamed from redisplay_region
Richard M. Stallman <rms@gnu.org>
parents: 16144
diff changeset
3644
27012
520f982f3a9a (modify_overlay): Always compute unchanged info.
Gerd Moellmann <gerd@gnu.org>
parents: 26970
diff changeset
3645 BUF_COMPUTE_UNCHANGED (buf, start, end);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49444
diff changeset
3646
16193
6ff2ef91c618 (modify_overlay): Renamed from redisplay_region
Richard M. Stallman <rms@gnu.org>
parents: 16144
diff changeset
3647 /* 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
3648 we must do other windows. */
6ff2ef91c618 (modify_overlay): Renamed from redisplay_region
Richard M. Stallman <rms@gnu.org>
parents: 16144
diff changeset
3649 if (buf != XBUFFER (XWINDOW (selected_window)->buffer))
6ff2ef91c618 (modify_overlay): Renamed from redisplay_region
Richard M. Stallman <rms@gnu.org>
parents: 16144
diff changeset
3650 windows_or_buffers_changed = 1;
6ff2ef91c618 (modify_overlay): Renamed from redisplay_region
Richard M. Stallman <rms@gnu.org>
parents: 16144
diff changeset
3651 /* 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
3652 else if (buffer_shared > 1)
6ff2ef91c618 (modify_overlay): Renamed from redisplay_region
Richard M. Stallman <rms@gnu.org>
parents: 16144
diff changeset
3653 windows_or_buffers_changed = 1;
6ff2ef91c618 (modify_overlay): Renamed from redisplay_region
Richard M. Stallman <rms@gnu.org>
parents: 16144
diff changeset
3654
19801
7482ad23e430 (modify_overlay): Update overlay_modiff of proper buffer.
Richard M. Stallman <rms@gnu.org>
parents: 19581
diff changeset
3655 ++BUF_OVERLAY_MODIFF (buf);
16193
6ff2ef91c618 (modify_overlay): Renamed from redisplay_region
Richard M. Stallman <rms@gnu.org>
parents: 16144
diff changeset
3656 }
6ff2ef91c618 (modify_overlay): Renamed from redisplay_region
Richard M. Stallman <rms@gnu.org>
parents: 16144
diff changeset
3657
39971
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
3658
18613
614b916ff5bf Fix bugs with inappropriate mixing of Lisp_Object with int.
Richard M. Stallman <rms@gnu.org>
parents: 18603
diff changeset
3659 Lisp_Object Fdelete_overlay ();
614b916ff5bf Fix bugs with inappropriate mixing of Lisp_Object with int.
Richard M. Stallman <rms@gnu.org>
parents: 18603
diff changeset
3660
51844
c5036e7cc93b (overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51827
diff changeset
3661 static struct Lisp_Overlay *
c5036e7cc93b (overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51827
diff changeset
3662 unchain_overlay (list, overlay)
c5036e7cc93b (overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51827
diff changeset
3663 struct Lisp_Overlay *list, *overlay;
c5036e7cc93b (overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51827
diff changeset
3664 {
c5036e7cc93b (overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51827
diff changeset
3665 struct Lisp_Overlay *tmp, *prev;
c5036e7cc93b (overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51827
diff changeset
3666 for (tmp = list, prev = NULL; tmp; prev = tmp, tmp = tmp->next)
c5036e7cc93b (overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51827
diff changeset
3667 if (tmp == overlay)
c5036e7cc93b (overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51827
diff changeset
3668 {
c5036e7cc93b (overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51827
diff changeset
3669 if (prev)
c5036e7cc93b (overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51827
diff changeset
3670 prev->next = tmp->next;
c5036e7cc93b (overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51827
diff changeset
3671 else
c5036e7cc93b (overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51827
diff changeset
3672 list = tmp->next;
c5036e7cc93b (overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51827
diff changeset
3673 overlay->next = NULL;
c5036e7cc93b (overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51827
diff changeset
3674 break;
c5036e7cc93b (overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51827
diff changeset
3675 }
c5036e7cc93b (overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51827
diff changeset
3676 return list;
c5036e7cc93b (overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51827
diff changeset
3677 }
c5036e7cc93b (overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51827
diff changeset
3678
2508
3aa2f3b35353 * buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents: 2486
diff changeset
3679 DEFUN ("move-overlay", Fmove_overlay, Smove_overlay, 3, 4, 0,
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39974
diff changeset
3680 doc: /* Set the endpoints of OVERLAY to BEG and END in BUFFER.
39971
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
3681 If BUFFER is omitted, leave OVERLAY in the same buffer it inhabits now.
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
3682 If BUFFER is omitted, and OVERLAY is in no buffer, put it in the current
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39974
diff changeset
3683 buffer. */)
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39974
diff changeset
3684 (overlay, beg, end, buffer)
2508
3aa2f3b35353 * buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents: 2486
diff changeset
3685 Lisp_Object overlay, beg, end, buffer;
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3686 {
3533
78b4e6241f85 (Fdelete_overlay): Do nothing if overlay already deleted.
Richard M. Stallman <rms@gnu.org>
parents: 3481
diff changeset
3687 struct buffer *b, *ob;
78b4e6241f85 (Fdelete_overlay): Do nothing if overlay already deleted.
Richard M. Stallman <rms@gnu.org>
parents: 3481
diff changeset
3688 Lisp_Object obuffer;
46293
1fb8f75062c6 Use macro SPECPDL_INDEX.
Juanma Barranquero <lekktu@gmail.com>
parents: 46199
diff changeset
3689 int count = SPECPDL_INDEX ();
2508
3aa2f3b35353 * buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents: 2486
diff changeset
3690
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40605
diff changeset
3691 CHECK_OVERLAY (overlay);
2508
3aa2f3b35353 * buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents: 2486
diff changeset
3692 if (NILP (buffer))
3aa2f3b35353 * buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents: 2486
diff changeset
3693 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
3694 if (NILP (buffer))
9262
582534b6e763 (Fget_buffer_create, Frename_buffer, Fbuffer_disable_undo,
Karl Heuer <kwzh@gnu.org>
parents: 9211
diff changeset
3695 XSETBUFFER (buffer, current_buffer);
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40605
diff changeset
3696 CHECK_BUFFER (buffer);
3031
5c96dfc52433 * buffer.c (Fmake_overlay): Put beg and end in the
Jim Blandy <jimb@redhat.com>
parents: 2961
diff changeset
3697
5c96dfc52433 * buffer.c (Fmake_overlay): Put beg and end in the
Jim Blandy <jimb@redhat.com>
parents: 2961
diff changeset
3698 if (MARKERP (beg)
5c96dfc52433 * buffer.c (Fmake_overlay): Put beg and end in the
Jim Blandy <jimb@redhat.com>
parents: 2961
diff changeset
3699 && ! 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
3700 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
3701 if (MARKERP (end)
5c96dfc52433 * buffer.c (Fmake_overlay): Put beg and end in the
Jim Blandy <jimb@redhat.com>
parents: 2961
diff changeset
3702 && ! 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
3703 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
3704
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40605
diff changeset
3705 CHECK_NUMBER_COERCE_MARKER (beg);
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40605
diff changeset
3706 CHECK_NUMBER_COERCE_MARKER (end);
2722
16db9d1af886 Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents: 2645
diff changeset
3707
8839
41981db9ad8e (Qevaporate): New symbol.
Karl Heuer <kwzh@gnu.org>
parents: 8818
diff changeset
3708 if (XINT (beg) == XINT (end) && ! NILP (Foverlay_get (overlay, Qevaporate)))
41981db9ad8e (Qevaporate): New symbol.
Karl Heuer <kwzh@gnu.org>
parents: 8818
diff changeset
3709 return Fdelete_overlay (overlay);
3533
78b4e6241f85 (Fdelete_overlay): Do nothing if overlay already deleted.
Richard M. Stallman <rms@gnu.org>
parents: 3481
diff changeset
3710
2722
16db9d1af886 Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents: 2645
diff changeset
3711 if (XINT (beg) > XINT (end))
16db9d1af886 Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents: 2645
diff changeset
3712 {
6493
33a461f14903 (sort_overlays, Fmake_overlay): Use assignment, not initialization.
Karl Heuer <kwzh@gnu.org>
parents: 6477
diff changeset
3713 Lisp_Object temp;
33a461f14903 (sort_overlays, Fmake_overlay): Use assignment, not initialization.
Karl Heuer <kwzh@gnu.org>
parents: 6477
diff changeset
3714 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
3715 }
16db9d1af886 Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents: 2645
diff changeset
3716
8839
41981db9ad8e (Qevaporate): New symbol.
Karl Heuer <kwzh@gnu.org>
parents: 8818
diff changeset
3717 specbind (Qinhibit_quit, Qt);
41981db9ad8e (Qevaporate): New symbol.
Karl Heuer <kwzh@gnu.org>
parents: 8818
diff changeset
3718
3533
78b4e6241f85 (Fdelete_overlay): Do nothing if overlay already deleted.
Richard M. Stallman <rms@gnu.org>
parents: 3481
diff changeset
3719 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
3720 b = XBUFFER (buffer);
28417
4b675266db04 * lisp.h (XCONS, XSTRING, XSYMBOL, XFLOAT, XPROCESS, XWINDOW, XSUBR, XBUFFER):
Ken Raeburn <raeburn@raeburn.org>
parents: 28352
diff changeset
3721 ob = BUFFERP (obuffer) ? XBUFFER (obuffer) : (struct buffer *) 0;
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3722
3204
a3007f83650c * buffer.c (Fmove_overlay): If the overlay is changing buffers,
Jim Blandy <jimb@redhat.com>
parents: 3031
diff changeset
3723 /* 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
3724 if (!EQ (buffer, obuffer))
7985
f6c309d5d314 (Fmove_overlay): Call redisplay_region even when
Richard M. Stallman <rms@gnu.org>
parents: 7670
diff changeset
3725 {
f6c309d5d314 (Fmove_overlay): Call redisplay_region even when
Richard M. Stallman <rms@gnu.org>
parents: 7670
diff changeset
3726 /* Redisplay where the overlay was. */
f6c309d5d314 (Fmove_overlay): Call redisplay_region even when
Richard M. Stallman <rms@gnu.org>
parents: 7670
diff changeset
3727 if (!NILP (obuffer))
f6c309d5d314 (Fmove_overlay): Call redisplay_region even when
Richard M. Stallman <rms@gnu.org>
parents: 7670
diff changeset
3728 {
18613
614b916ff5bf Fix bugs with inappropriate mixing of Lisp_Object with int.
Richard M. Stallman <rms@gnu.org>
parents: 18603
diff changeset
3729 int o_beg;
614b916ff5bf Fix bugs with inappropriate mixing of Lisp_Object with int.
Richard M. Stallman <rms@gnu.org>
parents: 18603
diff changeset
3730 int o_end;
7985
f6c309d5d314 (Fmove_overlay): Call redisplay_region even when
Richard M. Stallman <rms@gnu.org>
parents: 7670
diff changeset
3731
18105
bc690c1e1950 (Fmove_overlay): Clean up setting o_beg and o_end.
Richard M. Stallman <rms@gnu.org>
parents: 18009
diff changeset
3732 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
3733 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
3734
18613
614b916ff5bf Fix bugs with inappropriate mixing of Lisp_Object with int.
Richard M. Stallman <rms@gnu.org>
parents: 18603
diff changeset
3735 modify_overlay (ob, o_beg, o_end);
7985
f6c309d5d314 (Fmove_overlay): Call redisplay_region even when
Richard M. Stallman <rms@gnu.org>
parents: 7670
diff changeset
3736 }
f6c309d5d314 (Fmove_overlay): Call redisplay_region even when
Richard M. Stallman <rms@gnu.org>
parents: 7670
diff changeset
3737
f6c309d5d314 (Fmove_overlay): Call redisplay_region even when
Richard M. Stallman <rms@gnu.org>
parents: 7670
diff changeset
3738 /* 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
3739 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
3740 }
3204
a3007f83650c * buffer.c (Fmove_overlay): If the overlay is changing buffers,
Jim Blandy <jimb@redhat.com>
parents: 3031
diff changeset
3741 else
a3007f83650c * buffer.c (Fmove_overlay): If the overlay is changing buffers,
Jim Blandy <jimb@redhat.com>
parents: 3031
diff changeset
3742 /* 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
3743 {
18613
614b916ff5bf Fix bugs with inappropriate mixing of Lisp_Object with int.
Richard M. Stallman <rms@gnu.org>
parents: 18603
diff changeset
3744 int o_beg, o_end;
2722
16db9d1af886 Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents: 2645
diff changeset
3745
18105
bc690c1e1950 (Fmove_overlay): Clean up setting o_beg and o_end.
Richard M. Stallman <rms@gnu.org>
parents: 18009
diff changeset
3746 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
3747 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
3748
18613
614b916ff5bf Fix bugs with inappropriate mixing of Lisp_Object with int.
Richard M. Stallman <rms@gnu.org>
parents: 18603
diff changeset
3749 if (o_beg == XINT (beg))
614b916ff5bf Fix bugs with inappropriate mixing of Lisp_Object with int.
Richard M. Stallman <rms@gnu.org>
parents: 18603
diff changeset
3750 modify_overlay (b, o_end, XINT (end));
614b916ff5bf Fix bugs with inappropriate mixing of Lisp_Object with int.
Richard M. Stallman <rms@gnu.org>
parents: 18603
diff changeset
3751 else if (o_end == XINT (end))
614b916ff5bf Fix bugs with inappropriate mixing of Lisp_Object with int.
Richard M. Stallman <rms@gnu.org>
parents: 18603
diff changeset
3752 modify_overlay (b, o_beg, XINT (beg));
3204
a3007f83650c * buffer.c (Fmove_overlay): If the overlay is changing buffers,
Jim Blandy <jimb@redhat.com>
parents: 3031
diff changeset
3753 else
a3007f83650c * buffer.c (Fmove_overlay): If the overlay is changing buffers,
Jim Blandy <jimb@redhat.com>
parents: 3031
diff changeset
3754 {
18613
614b916ff5bf Fix bugs with inappropriate mixing of Lisp_Object with int.
Richard M. Stallman <rms@gnu.org>
parents: 18603
diff changeset
3755 if (XINT (beg) < o_beg) o_beg = XINT (beg);
614b916ff5bf Fix bugs with inappropriate mixing of Lisp_Object with int.
Richard M. Stallman <rms@gnu.org>
parents: 18603
diff changeset
3756 if (XINT (end) > o_end) o_end = XINT (end);
614b916ff5bf Fix bugs with inappropriate mixing of Lisp_Object with int.
Richard M. Stallman <rms@gnu.org>
parents: 18603
diff changeset
3757 modify_overlay (b, o_beg, o_end);
3204
a3007f83650c * buffer.c (Fmove_overlay): If the overlay is changing buffers,
Jim Blandy <jimb@redhat.com>
parents: 3031
diff changeset
3758 }
a3007f83650c * buffer.c (Fmove_overlay): If the overlay is changing buffers,
Jim Blandy <jimb@redhat.com>
parents: 3031
diff changeset
3759 }
2722
16db9d1af886 Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents: 2645
diff changeset
3760
3533
78b4e6241f85 (Fdelete_overlay): Do nothing if overlay already deleted.
Richard M. Stallman <rms@gnu.org>
parents: 3481
diff changeset
3761 if (!NILP (obuffer))
78b4e6241f85 (Fdelete_overlay): Do nothing if overlay already deleted.
Richard M. Stallman <rms@gnu.org>
parents: 3481
diff changeset
3762 {
51844
c5036e7cc93b (overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51827
diff changeset
3763 ob->overlays_before
c5036e7cc93b (overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51827
diff changeset
3764 = unchain_overlay (ob->overlays_before, XOVERLAY (overlay));
c5036e7cc93b (overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51827
diff changeset
3765 ob->overlays_after
c5036e7cc93b (overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51827
diff changeset
3766 = unchain_overlay (ob->overlays_after, XOVERLAY (overlay));
c5036e7cc93b (overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51827
diff changeset
3767 eassert (XOVERLAY (overlay)->next == NULL);
3533
78b4e6241f85 (Fdelete_overlay): Do nothing if overlay already deleted.
Richard M. Stallman <rms@gnu.org>
parents: 3481
diff changeset
3768 }
2508
3aa2f3b35353 * buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents: 2486
diff changeset
3769
3aa2f3b35353 * buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents: 2486
diff changeset
3770 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
3771 Fset_marker (OVERLAY_END (overlay), end, buffer);
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3772
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49444
diff changeset
3773 /* Put the overlay on the wrong list. */
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3774 end = OVERLAY_END (overlay);
51824
9f5665eb77bd (reset_buffer, recenter_overlay_lists)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51782
diff changeset
3775 if (OVERLAY_POSITION (end) < b->overlay_center)
51844
c5036e7cc93b (overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51827
diff changeset
3776 {
52253
79185e10e92f (Fmove_overlay): Set overlay's next pointer
Gerd Moellmann <gerd@gnu.org>
parents: 52012
diff changeset
3777 XOVERLAY (overlay)->next = b->overlays_after;
79185e10e92f (Fmove_overlay): Set overlay's next pointer
Gerd Moellmann <gerd@gnu.org>
parents: 52012
diff changeset
3778 b->overlays_after = XOVERLAY (overlay);
51844
c5036e7cc93b (overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51827
diff changeset
3779 }
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3780 else
51844
c5036e7cc93b (overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51827
diff changeset
3781 {
52253
79185e10e92f (Fmove_overlay): Set overlay's next pointer
Gerd Moellmann <gerd@gnu.org>
parents: 52012
diff changeset
3782 XOVERLAY (overlay)->next = b->overlays_before;
79185e10e92f (Fmove_overlay): Set overlay's next pointer
Gerd Moellmann <gerd@gnu.org>
parents: 52012
diff changeset
3783 b->overlays_before = XOVERLAY (overlay);
51844
c5036e7cc93b (overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51827
diff changeset
3784 }
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3785
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3786 /* This puts it in the right list, and in the right order. */
51824
9f5665eb77bd (reset_buffer, recenter_overlay_lists)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51782
diff changeset
3787 recenter_overlay_lists (b, b->overlay_center);
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3788
3533
78b4e6241f85 (Fdelete_overlay): Do nothing if overlay already deleted.
Richard M. Stallman <rms@gnu.org>
parents: 3481
diff changeset
3789 return unbind_to (count, overlay);
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3790 }
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3791
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3792 DEFUN ("delete-overlay", Fdelete_overlay, Sdelete_overlay, 1, 1, 0,
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39974
diff changeset
3793 doc: /* Delete the overlay OVERLAY from its buffer. */)
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39974
diff changeset
3794 (overlay)
2508
3aa2f3b35353 * buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents: 2486
diff changeset
3795 Lisp_Object overlay;
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3796 {
3533
78b4e6241f85 (Fdelete_overlay): Do nothing if overlay already deleted.
Richard M. Stallman <rms@gnu.org>
parents: 3481
diff changeset
3797 Lisp_Object buffer;
2508
3aa2f3b35353 * buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents: 2486
diff changeset
3798 struct buffer *b;
46293
1fb8f75062c6 Use macro SPECPDL_INDEX.
Juanma Barranquero <lekktu@gmail.com>
parents: 46199
diff changeset
3799 int count = SPECPDL_INDEX ();
2508
3aa2f3b35353 * buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents: 2486
diff changeset
3800
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40605
diff changeset
3801 CHECK_OVERLAY (overlay);
2776
8bf3bb4c20dd * lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents: 2722
diff changeset
3802
3533
78b4e6241f85 (Fdelete_overlay): Do nothing if overlay already deleted.
Richard M. Stallman <rms@gnu.org>
parents: 3481
diff changeset
3803 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
3804 if (NILP (buffer))
78b4e6241f85 (Fdelete_overlay): Do nothing if overlay already deleted.
Richard M. Stallman <rms@gnu.org>
parents: 3481
diff changeset
3805 return Qnil;
78b4e6241f85 (Fdelete_overlay): Do nothing if overlay already deleted.
Richard M. Stallman <rms@gnu.org>
parents: 3481
diff changeset
3806
78b4e6241f85 (Fdelete_overlay): Do nothing if overlay already deleted.
Richard M. Stallman <rms@gnu.org>
parents: 3481
diff changeset
3807 b = XBUFFER (buffer);
78b4e6241f85 (Fdelete_overlay): Do nothing if overlay already deleted.
Richard M. Stallman <rms@gnu.org>
parents: 3481
diff changeset
3808 specbind (Qinhibit_quit, Qt);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49444
diff changeset
3809
51844
c5036e7cc93b (overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51827
diff changeset
3810 b->overlays_before = unchain_overlay (b->overlays_before,XOVERLAY (overlay));
c5036e7cc93b (overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51827
diff changeset
3811 b->overlays_after = unchain_overlay (b->overlays_after, XOVERLAY (overlay));
c5036e7cc93b (overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51827
diff changeset
3812 eassert (XOVERLAY (overlay)->next == NULL);
16193
6ff2ef91c618 (modify_overlay): Renamed from redisplay_region
Richard M. Stallman <rms@gnu.org>
parents: 16144
diff changeset
3813 modify_overlay (b,
21898
afbf4a3def4c Whitespace change.
Richard M. Stallman <rms@gnu.org>
parents: 21514
diff changeset
3814 marker_position (OVERLAY_START (overlay)),
afbf4a3def4c Whitespace change.
Richard M. Stallman <rms@gnu.org>
parents: 21514
diff changeset
3815 marker_position (OVERLAY_END (overlay)));
2791
4f234fbfb02c * buffer.c (Fmove_overlay): If the overlay is in no buffer and the
Jim Blandy <jimb@redhat.com>
parents: 2787
diff changeset
3816 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
3817 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
3818
39337
b20b329387f5 Fix a typo in a comment.
Eli Zaretskii <eliz@gnu.org>
parents: 39333
diff changeset
3819 /* When deleting an overlay with before or after strings, turn off
39333
7af35736264f (modify_overlay): Don't do nothing if START == END;
Gerd Moellmann <gerd@gnu.org>
parents: 39087
diff changeset
3820 display optimizations for the affected buffer, on the basis that
7af35736264f (modify_overlay): Don't do nothing if START == END;
Gerd Moellmann <gerd@gnu.org>
parents: 39087
diff changeset
3821 these strings may contain newlines. This is easier to do than to
7af35736264f (modify_overlay): Don't do nothing if START == END;
Gerd Moellmann <gerd@gnu.org>
parents: 39087
diff changeset
3822 check for that situation during redisplay. */
7af35736264f (modify_overlay): Don't do nothing if START == END;
Gerd Moellmann <gerd@gnu.org>
parents: 39087
diff changeset
3823 if (!windows_or_buffers_changed
7af35736264f (modify_overlay): Don't do nothing if START == END;
Gerd Moellmann <gerd@gnu.org>
parents: 39087
diff changeset
3824 && (!NILP (Foverlay_get (overlay, Qbefore_string))
7af35736264f (modify_overlay): Don't do nothing if START == END;
Gerd Moellmann <gerd@gnu.org>
parents: 39087
diff changeset
3825 || !NILP (Foverlay_get (overlay, Qafter_string))))
7af35736264f (modify_overlay): Don't do nothing if START == END;
Gerd Moellmann <gerd@gnu.org>
parents: 39087
diff changeset
3826 b->prevent_redisplay_optimizations_p = 1;
7af35736264f (modify_overlay): Don't do nothing if START == END;
Gerd Moellmann <gerd@gnu.org>
parents: 39087
diff changeset
3827
3533
78b4e6241f85 (Fdelete_overlay): Do nothing if overlay already deleted.
Richard M. Stallman <rms@gnu.org>
parents: 3481
diff changeset
3828 return unbind_to (count, Qnil);
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3829 }
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3830
2787
995c6e665599 * buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents: 2776
diff changeset
3831 /* Overlay dissection functions. */
995c6e665599 * buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents: 2776
diff changeset
3832
995c6e665599 * buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents: 2776
diff changeset
3833 DEFUN ("overlay-start", Foverlay_start, Soverlay_start, 1, 1, 0,
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39974
diff changeset
3834 doc: /* Return the position at which OVERLAY starts. */)
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39974
diff changeset
3835 (overlay)
2787
995c6e665599 * buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents: 2776
diff changeset
3836 Lisp_Object overlay;
995c6e665599 * buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents: 2776
diff changeset
3837 {
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40605
diff changeset
3838 CHECK_OVERLAY (overlay);
2787
995c6e665599 * buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents: 2776
diff changeset
3839
995c6e665599 * buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents: 2776
diff changeset
3840 return (Fmarker_position (OVERLAY_START (overlay)));
995c6e665599 * buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents: 2776
diff changeset
3841 }
995c6e665599 * buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents: 2776
diff changeset
3842
995c6e665599 * buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents: 2776
diff changeset
3843 DEFUN ("overlay-end", Foverlay_end, Soverlay_end, 1, 1, 0,
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39974
diff changeset
3844 doc: /* Return the position at which OVERLAY ends. */)
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39974
diff changeset
3845 (overlay)
2787
995c6e665599 * buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents: 2776
diff changeset
3846 Lisp_Object overlay;
995c6e665599 * buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents: 2776
diff changeset
3847 {
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40605
diff changeset
3848 CHECK_OVERLAY (overlay);
2787
995c6e665599 * buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents: 2776
diff changeset
3849
995c6e665599 * buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents: 2776
diff changeset
3850 return (Fmarker_position (OVERLAY_END (overlay)));
995c6e665599 * buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents: 2776
diff changeset
3851 }
995c6e665599 * buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents: 2776
diff changeset
3852
995c6e665599 * buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents: 2776
diff changeset
3853 DEFUN ("overlay-buffer", Foverlay_buffer, Soverlay_buffer, 1, 1, 0,
60217
f0a03b682c19 (Foverlay_buffer): Doc fix.
Lute Kamstra <lute@gnu.org>
parents: 59891
diff changeset
3854 doc: /* Return the buffer OVERLAY belongs to.
f0a03b682c19 (Foverlay_buffer): Doc fix.
Lute Kamstra <lute@gnu.org>
parents: 59891
diff changeset
3855 Return nil if OVERLAY has been deleted. */)
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39974
diff changeset
3856 (overlay)
2787
995c6e665599 * buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents: 2776
diff changeset
3857 Lisp_Object overlay;
995c6e665599 * buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents: 2776
diff changeset
3858 {
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40605
diff changeset
3859 CHECK_OVERLAY (overlay);
2787
995c6e665599 * buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents: 2776
diff changeset
3860
995c6e665599 * buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents: 2776
diff changeset
3861 return Fmarker_buffer (OVERLAY_START (overlay));
995c6e665599 * buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents: 2776
diff changeset
3862 }
995c6e665599 * buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents: 2776
diff changeset
3863
995c6e665599 * buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents: 2776
diff changeset
3864 DEFUN ("overlay-properties", Foverlay_properties, Soverlay_properties, 1, 1, 0,
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39974
diff changeset
3865 doc: /* Return a list of the properties on OVERLAY.
39971
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
3866 This is a copy of OVERLAY's plist; modifying its conses has no effect on
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39974
diff changeset
3867 OVERLAY. */)
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39974
diff changeset
3868 (overlay)
2787
995c6e665599 * buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents: 2776
diff changeset
3869 Lisp_Object overlay;
995c6e665599 * buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents: 2776
diff changeset
3870 {
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40605
diff changeset
3871 CHECK_OVERLAY (overlay);
2787
995c6e665599 * buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents: 2776
diff changeset
3872
9922
f653d8aac66a (Fmake_overlay, Foverlay_properties, Foverlay_get, Foverlay_put): Use new
Karl Heuer <kwzh@gnu.org>
parents: 9920
diff changeset
3873 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
3874 }
995c6e665599 * buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents: 2776
diff changeset
3875
995c6e665599 * buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents: 2776
diff changeset
3876
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3877 DEFUN ("overlays-at", Foverlays_at, Soverlays_at, 1, 1, 0,
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39974
diff changeset
3878 doc: /* Return a list of the overlays that contain position POS. */)
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39974
diff changeset
3879 (pos)
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3880 Lisp_Object pos;
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3881 {
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3882 int noverlays;
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3883 Lisp_Object *overlay_vec;
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3884 int len;
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3885 Lisp_Object result;
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3886
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40605
diff changeset
3887 CHECK_NUMBER_COERCE_MARKER (pos);
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3888
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3889 len = 10;
30911
c1de0fc3a34b (Fget_buffer_create, Fmake_indirect_buffer): Avoid
Dave Love <fx@gnu.org>
parents: 30695
diff changeset
3890 /* We can't use alloca here because overlays_at can call xrealloc. */
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3891 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
3892
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3893 /* 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
3894 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
3895 noverlays = overlays_at (XINT (pos), 1, &overlay_vec, &len,
30695
48cc3d076524 (overlays_at): Add CHANGE_REQ parameter.
Miles Bader <miles@gnu.org>
parents: 30360
diff changeset
3896 (int *) 0, (int *) 0, 0);
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3897
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3898 /* Make a list of them all. */
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3899 result = Flist (noverlays, overlay_vec);
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3900
2439
b6c62e4abf59 Put interrupt input blocking in a separate file from xterm.h.
Jim Blandy <jimb@redhat.com>
parents: 2389
diff changeset
3901 xfree (overlay_vec);
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3902 return result;
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3903 }
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3904
12382
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
3905 DEFUN ("overlays-in", Foverlays_in, Soverlays_in, 2, 2, 0,
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39974
diff changeset
3906 doc: /* Return a list of the overlays that overlap the region BEG ... END.
39971
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
3907 Overlap means that at least one character is contained within the overlay
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
3908 and also contained within the specified region.
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
3909 Empty overlays are included in the result if they are located at BEG
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39974
diff changeset
3910 or between BEG and END. */)
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39974
diff changeset
3911 (beg, end)
12382
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
3912 Lisp_Object beg, end;
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
3913 {
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
3914 int noverlays;
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
3915 Lisp_Object *overlay_vec;
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
3916 int len;
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
3917 Lisp_Object result;
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
3918
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40605
diff changeset
3919 CHECK_NUMBER_COERCE_MARKER (beg);
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40605
diff changeset
3920 CHECK_NUMBER_COERCE_MARKER (end);
12382
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
3921
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
3922 len = 10;
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
3923 overlay_vec = (Lisp_Object *) xmalloc (len * sizeof (Lisp_Object));
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
3924
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
3925 /* 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
3926 Store the length in len. */
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
3927 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
3928 (int *) 0, (int *) 0);
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
3929
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
3930 /* Make a list of them all. */
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
3931 result = Flist (noverlays, overlay_vec);
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
3932
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
3933 xfree (overlay_vec);
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
3934 return result;
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
3935 }
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
3936
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3937 DEFUN ("next-overlay-change", Fnext_overlay_change, Snext_overlay_change,
40108
6084dfa5f85d Reindent DEFUNs and DEFVARs woth doc: keywords.
Pavel Janík <Pavel@Janik.cz>
parents: 39988
diff changeset
3938 1, 1, 0,
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39974
diff changeset
3939 doc: /* Return the next position after POS where an overlay starts or ends.
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39974
diff changeset
3940 If there are no more overlay boundaries after POS, return (point-max). */)
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39974
diff changeset
3941 (pos)
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3942 Lisp_Object pos;
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3943 {
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3944 int noverlays;
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3945 int endpos;
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3946 Lisp_Object *overlay_vec;
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3947 int len;
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3948 int i;
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3949
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40605
diff changeset
3950 CHECK_NUMBER_COERCE_MARKER (pos);
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3951
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3952 len = 10;
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3953 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
3954
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3955 /* 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
3956 Store the length in len.
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3957 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
3958 noverlays = overlays_at (XINT (pos), 1, &overlay_vec, &len,
30695
48cc3d076524 (overlays_at): Add CHANGE_REQ parameter.
Miles Bader <miles@gnu.org>
parents: 30360
diff changeset
3959 &endpos, (int *) 0, 1);
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3960
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3961 /* If any of these overlays ends before endpos,
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3962 use its ending point instead. */
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3963 for (i = 0; i < noverlays; i++)
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3964 {
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3965 Lisp_Object oend;
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3966 int oendpos;
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3967
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3968 oend = OVERLAY_END (overlay_vec[i]);
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3969 oendpos = OVERLAY_POSITION (oend);
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3970 if (oendpos < endpos)
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3971 endpos = oendpos;
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3972 }
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3973
2439
b6c62e4abf59 Put interrupt input blocking in a separate file from xterm.h.
Jim Blandy <jimb@redhat.com>
parents: 2389
diff changeset
3974 xfree (overlay_vec);
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3975 return make_number (endpos);
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3976 }
8967
80b92977ed08 (overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents: 8924
diff changeset
3977
80b92977ed08 (overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents: 8924
diff changeset
3978 DEFUN ("previous-overlay-change", Fprevious_overlay_change,
80b92977ed08 (overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents: 8924
diff changeset
3979 Sprevious_overlay_change, 1, 1, 0,
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39974
diff changeset
3980 doc: /* Return the previous position before POS where an overlay starts or ends.
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39974
diff changeset
3981 If there are no more overlay boundaries before POS, return (point-min). */)
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39974
diff changeset
3982 (pos)
8967
80b92977ed08 (overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents: 8924
diff changeset
3983 Lisp_Object pos;
80b92977ed08 (overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents: 8924
diff changeset
3984 {
80b92977ed08 (overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents: 8924
diff changeset
3985 int noverlays;
80b92977ed08 (overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents: 8924
diff changeset
3986 int prevpos;
80b92977ed08 (overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents: 8924
diff changeset
3987 Lisp_Object *overlay_vec;
80b92977ed08 (overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents: 8924
diff changeset
3988 int len;
80b92977ed08 (overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents: 8924
diff changeset
3989
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40605
diff changeset
3990 CHECK_NUMBER_COERCE_MARKER (pos);
8967
80b92977ed08 (overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents: 8924
diff changeset
3991
12214
c6ee462394fe (Fprevious_overlay_change): Check for overlays that end at POS.
Richard M. Stallman <rms@gnu.org>
parents: 12110
diff changeset
3992 /* 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
3993 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
3994 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
3995 return pos;
c6ee462394fe (Fprevious_overlay_change): Check for overlays that end at POS.
Richard M. Stallman <rms@gnu.org>
parents: 12110
diff changeset
3996
30360
92f92a541686 (Fprevious_overlay_change): Avoid memory leak.
Gerd Moellmann <gerd@gnu.org>
parents: 29456
diff changeset
3997 len = 10;
92f92a541686 (Fprevious_overlay_change): Avoid memory leak.
Gerd Moellmann <gerd@gnu.org>
parents: 29456
diff changeset
3998 overlay_vec = (Lisp_Object *) xmalloc (len * sizeof (Lisp_Object));
92f92a541686 (Fprevious_overlay_change): Avoid memory leak.
Gerd Moellmann <gerd@gnu.org>
parents: 29456
diff changeset
3999
8967
80b92977ed08 (overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents: 8924
diff changeset
4000 /* 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
4001 Store the length in len.
25205
14269f6d315b (Fprevious_overlay_change): Just return the answer obtained from overlays_at.
Richard M. Stallman <rms@gnu.org>
parents: 25184
diff changeset
4002 prevpos gets the position of the previous change. */
11418
f892e7cb7f51 (Foverlays_at, Fnext_overlay_change): Don't use NULL.
Richard M. Stallman <rms@gnu.org>
parents: 11414
diff changeset
4003 noverlays = overlays_at (XINT (pos), 1, &overlay_vec, &len,
30695
48cc3d076524 (overlays_at): Add CHANGE_REQ parameter.
Miles Bader <miles@gnu.org>
parents: 30360
diff changeset
4004 (int *) 0, &prevpos, 1);
8967
80b92977ed08 (overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents: 8924
diff changeset
4005
80b92977ed08 (overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents: 8924
diff changeset
4006 xfree (overlay_vec);
80b92977ed08 (overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents: 8924
diff changeset
4007 return make_number (prevpos);
80b92977ed08 (overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents: 8924
diff changeset
4008 }
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
4009
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
4010 /* These functions are for debugging overlays. */
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
4011
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
4012 DEFUN ("overlay-lists", Foverlay_lists, Soverlay_lists, 0, 0, 0,
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39974
diff changeset
4013 doc: /* Return a pair of lists giving all the overlays of the current buffer.
39971
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
4014 The car has all the overlays before the overlay center;
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
4015 the cdr has all the overlays after the overlay center.
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
4016 Recentering overlays moves overlays between these lists.
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
4017 The lists you get are copies, so that changing them has no effect.
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39974
diff changeset
4018 However, the overlays you get are the real objects that the buffer uses. */)
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39974
diff changeset
4019 ()
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
4020 {
51844
c5036e7cc93b (overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51827
diff changeset
4021 struct Lisp_Overlay *ol;
c5036e7cc93b (overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51827
diff changeset
4022 Lisp_Object before = Qnil, after = Qnil, tmp;
c5036e7cc93b (overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51827
diff changeset
4023 for (ol = current_buffer->overlays_before; ol; ol = ol->next)
c5036e7cc93b (overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51827
diff changeset
4024 {
c5036e7cc93b (overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51827
diff changeset
4025 XSETMISC (tmp, ol);
c5036e7cc93b (overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51827
diff changeset
4026 before = Fcons (tmp, before);
c5036e7cc93b (overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51827
diff changeset
4027 }
c5036e7cc93b (overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51827
diff changeset
4028 for (ol = current_buffer->overlays_after; ol; ol = ol->next)
c5036e7cc93b (overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51827
diff changeset
4029 {
c5036e7cc93b (overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51827
diff changeset
4030 XSETMISC (tmp, ol);
c5036e7cc93b (overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51827
diff changeset
4031 after = Fcons (tmp, after);
c5036e7cc93b (overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51827
diff changeset
4032 }
c5036e7cc93b (overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51827
diff changeset
4033 return Fcons (Fnreverse (before), Fnreverse (after));
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
4034 }
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
4035
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
4036 DEFUN ("overlay-recenter", Foverlay_recenter, Soverlay_recenter, 1, 1, 0,
50605
d91f2dfe45eb (Foverlay_recenter): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 50304
diff changeset
4037 doc: /* Recenter the overlays of the current buffer around position POS.
d91f2dfe45eb (Foverlay_recenter): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 50304
diff changeset
4038 That makes overlay lookup faster for positions near POS (but perhaps slower
d91f2dfe45eb (Foverlay_recenter): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 50304
diff changeset
4039 for positions far away from POS). */)
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39974
diff changeset
4040 (pos)
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
4041 Lisp_Object pos;
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
4042 {
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40605
diff changeset
4043 CHECK_NUMBER_COERCE_MARKER (pos);
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
4044
2508
3aa2f3b35353 * buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents: 2486
diff changeset
4045 recenter_overlay_lists (current_buffer, XINT (pos));
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
4046 return Qnil;
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
4047 }
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
4048
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
4049 DEFUN ("overlay-get", Foverlay_get, Soverlay_get, 2, 2, 0,
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39974
diff changeset
4050 doc: /* Get the property of overlay OVERLAY with property name PROP. */)
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39974
diff changeset
4051 (overlay, prop)
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
4052 Lisp_Object overlay, prop;
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
4053 {
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40605
diff changeset
4054 CHECK_OVERLAY (overlay);
45683
9e40bb8e9a60 (Foverlay_get): Use lookup_char_property.
Colin Walters <walters@gnu.org>
parents: 45626
diff changeset
4055 return lookup_char_property (XOVERLAY (overlay)->plist, prop, 0);
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
4056 }
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
4057
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
4058 DEFUN ("overlay-put", Foverlay_put, Soverlay_put, 3, 3, 0,
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39974
diff changeset
4059 doc: /* Set one property of overlay OVERLAY: give property PROP value VALUE. */)
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39974
diff changeset
4060 (overlay, prop, value)
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
4061 Lisp_Object overlay, prop, value;
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
4062 {
9922
f653d8aac66a (Fmake_overlay, Foverlay_properties, Foverlay_get, Foverlay_put): Use new
Karl Heuer <kwzh@gnu.org>
parents: 9920
diff changeset
4063 Lisp_Object tail, buffer;
8839
41981db9ad8e (Qevaporate): New symbol.
Karl Heuer <kwzh@gnu.org>
parents: 8818
diff changeset
4064 int changed;
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
4065
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40605
diff changeset
4066 CHECK_OVERLAY (overlay);
2722
16db9d1af886 Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents: 2645
diff changeset
4067
8062
ad595e4e165c (send_process): Major rewrite.
Richard M. Stallman <rms@gnu.org>
parents: 8035
diff changeset
4068 buffer = Fmarker_buffer (OVERLAY_START (overlay));
ad595e4e165c (send_process): Major rewrite.
Richard M. Stallman <rms@gnu.org>
parents: 8035
diff changeset
4069
9922
f653d8aac66a (Fmake_overlay, Foverlay_properties, Foverlay_get, Foverlay_put): Use new
Karl Heuer <kwzh@gnu.org>
parents: 9920
diff changeset
4070 for (tail = XOVERLAY (overlay)->plist;
26164
d39ec0a27081 more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents: 26088
diff changeset
4071 CONSP (tail) && CONSP (XCDR (tail));
d39ec0a27081 more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents: 26088
diff changeset
4072 tail = XCDR (XCDR (tail)))
d39ec0a27081 more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents: 26088
diff changeset
4073 if (EQ (XCAR (tail), prop))
8062
ad595e4e165c (send_process): Major rewrite.
Richard M. Stallman <rms@gnu.org>
parents: 8035
diff changeset
4074 {
26164
d39ec0a27081 more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents: 26088
diff changeset
4075 changed = !EQ (XCAR (XCDR (tail)), value);
39973
579177964efa Avoid (most) uses of XCAR/XCDR as lvalues, for flexibility in experimenting
Ken Raeburn <raeburn@raeburn.org>
parents: 39971
diff changeset
4076 XSETCAR (XCDR (tail), value);
8839
41981db9ad8e (Qevaporate): New symbol.
Karl Heuer <kwzh@gnu.org>
parents: 8818
diff changeset
4077 goto found;
8062
ad595e4e165c (send_process): Major rewrite.
Richard M. Stallman <rms@gnu.org>
parents: 8035
diff changeset
4078 }
8839
41981db9ad8e (Qevaporate): New symbol.
Karl Heuer <kwzh@gnu.org>
parents: 8818
diff changeset
4079 /* 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
4080 changed = !NILP (value);
9922
f653d8aac66a (Fmake_overlay, Foverlay_properties, Foverlay_get, Foverlay_put): Use new
Karl Heuer <kwzh@gnu.org>
parents: 9920
diff changeset
4081 XOVERLAY (overlay)->plist
f653d8aac66a (Fmake_overlay, Foverlay_properties, Foverlay_get, Foverlay_put): Use new
Karl Heuer <kwzh@gnu.org>
parents: 9920
diff changeset
4082 = Fcons (prop, Fcons (value, XOVERLAY (overlay)->plist));
8839
41981db9ad8e (Qevaporate): New symbol.
Karl Heuer <kwzh@gnu.org>
parents: 8818
diff changeset
4083 found:
41981db9ad8e (Qevaporate): New symbol.
Karl Heuer <kwzh@gnu.org>
parents: 8818
diff changeset
4084 if (! NILP (buffer))
41981db9ad8e (Qevaporate): New symbol.
Karl Heuer <kwzh@gnu.org>
parents: 8818
diff changeset
4085 {
41981db9ad8e (Qevaporate): New symbol.
Karl Heuer <kwzh@gnu.org>
parents: 8818
diff changeset
4086 if (changed)
16193
6ff2ef91c618 (modify_overlay): Renamed from redisplay_region
Richard M. Stallman <rms@gnu.org>
parents: 16144
diff changeset
4087 modify_overlay (XBUFFER (buffer),
39333
7af35736264f (modify_overlay): Don't do nothing if START == END;
Gerd Moellmann <gerd@gnu.org>
parents: 39087
diff changeset
4088 marker_position (OVERLAY_START (overlay)),
7af35736264f (modify_overlay): Don't do nothing if START == END;
Gerd Moellmann <gerd@gnu.org>
parents: 39087
diff changeset
4089 marker_position (OVERLAY_END (overlay)));
8839
41981db9ad8e (Qevaporate): New symbol.
Karl Heuer <kwzh@gnu.org>
parents: 8818
diff changeset
4090 if (EQ (prop, Qevaporate) && ! NILP (value)
41981db9ad8e (Qevaporate): New symbol.
Karl Heuer <kwzh@gnu.org>
parents: 8818
diff changeset
4091 && (OVERLAY_POSITION (OVERLAY_START (overlay))
41981db9ad8e (Qevaporate): New symbol.
Karl Heuer <kwzh@gnu.org>
parents: 8818
diff changeset
4092 == OVERLAY_POSITION (OVERLAY_END (overlay))))
41981db9ad8e (Qevaporate): New symbol.
Karl Heuer <kwzh@gnu.org>
parents: 8818
diff changeset
4093 Fdelete_overlay (overlay);
41981db9ad8e (Qevaporate): New symbol.
Karl Heuer <kwzh@gnu.org>
parents: 8818
diff changeset
4094 }
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
4095 return value;
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
4096 }
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
4097
12538
5920994b14c2 (last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 12488
diff changeset
4098 /* Subroutine of report_overlay_modification. */
5920994b14c2 (last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 12488
diff changeset
4099
5920994b14c2 (last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 12488
diff changeset
4100 /* Lisp vector holding overlay hook functions to call.
5920994b14c2 (last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 12488
diff changeset
4101 Vector elements come in pairs.
5920994b14c2 (last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 12488
diff changeset
4102 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
4103 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
4104
5920994b14c2 (last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 12488
diff changeset
4105 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
4106 as we call overlay hook functions.
5920994b14c2 (last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 12488
diff changeset
4107 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
4108 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
4109 static Lisp_Object last_overlay_modification_hooks;
5920994b14c2 (last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 12488
diff changeset
4110
5920994b14c2 (last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 12488
diff changeset
4111 /* 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
4112 static int last_overlay_modification_hooks_used;
5920994b14c2 (last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 12488
diff changeset
4113
5920994b14c2 (last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 12488
diff changeset
4114 /* Add one functionlist/overlay pair
5920994b14c2 (last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 12488
diff changeset
4115 to the end of last_overlay_modification_hooks. */
5920994b14c2 (last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 12488
diff changeset
4116
5920994b14c2 (last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 12488
diff changeset
4117 static void
5920994b14c2 (last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 12488
diff changeset
4118 add_overlay_mod_hooklist (functionlist, overlay)
5920994b14c2 (last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 12488
diff changeset
4119 Lisp_Object functionlist, overlay;
5920994b14c2 (last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 12488
diff changeset
4120 {
5920994b14c2 (last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 12488
diff changeset
4121 int oldsize = XVECTOR (last_overlay_modification_hooks)->size;
5920994b14c2 (last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 12488
diff changeset
4122
5920994b14c2 (last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 12488
diff changeset
4123 if (last_overlay_modification_hooks_used == oldsize)
5920994b14c2 (last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 12488
diff changeset
4124 {
5920994b14c2 (last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 12488
diff changeset
4125 Lisp_Object old;
5920994b14c2 (last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 12488
diff changeset
4126 old = last_overlay_modification_hooks;
5920994b14c2 (last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 12488
diff changeset
4127 last_overlay_modification_hooks
5920994b14c2 (last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 12488
diff changeset
4128 = 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
4129 bcopy (XVECTOR (old)->contents,
a46a40f1c30c (add_overlay_mod_hooklist): Fix call to bcopy.
Richard M. Stallman <rms@gnu.org>
parents: 15032
diff changeset
4130 XVECTOR (last_overlay_modification_hooks)->contents,
12538
5920994b14c2 (last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 12488
diff changeset
4131 sizeof (Lisp_Object) * oldsize);
5920994b14c2 (last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 12488
diff changeset
4132 }
51844
c5036e7cc93b (overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51827
diff changeset
4133 AREF (last_overlay_modification_hooks, last_overlay_modification_hooks_used++) = functionlist;
c5036e7cc93b (overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51827
diff changeset
4134 AREF (last_overlay_modification_hooks, last_overlay_modification_hooks_used++) = overlay;
12538
5920994b14c2 (last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 12488
diff changeset
4135 }
5920994b14c2 (last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 12488
diff changeset
4136
4077
a860278e3ab3 (verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents: 3884
diff changeset
4137 /* Run the modification-hooks of overlays that include
a860278e3ab3 (verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents: 3884
diff changeset
4138 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
4139 If this change is an insertion, also
5920994b14c2 (last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 12488
diff changeset
4140 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
4141 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
4142
24032289479c (report_overlay_modification): Renamed from verify_overlay_modification.
Richard M. Stallman <rms@gnu.org>
parents: 10143
diff changeset
4143 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
4144 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
4145
12538
5920994b14c2 (last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 12488
diff changeset
4146 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
4147 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
4148 the position after the inserted new text,
5920994b14c2 (last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 12488
diff changeset
4149 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
4150
a860278e3ab3 (verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents: 3884
diff changeset
4151 void
10146
24032289479c (report_overlay_modification): Renamed from verify_overlay_modification.
Richard M. Stallman <rms@gnu.org>
parents: 10143
diff changeset
4152 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
4153 Lisp_Object start, end;
10146
24032289479c (report_overlay_modification): Renamed from verify_overlay_modification.
Richard M. Stallman <rms@gnu.org>
parents: 10143
diff changeset
4154 int after;
24032289479c (report_overlay_modification): Renamed from verify_overlay_modification.
Richard M. Stallman <rms@gnu.org>
parents: 10143
diff changeset
4155 Lisp_Object arg1, arg2, arg3;
4077
a860278e3ab3 (verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents: 3884
diff changeset
4156 {
51844
c5036e7cc93b (overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51827
diff changeset
4157 Lisp_Object prop, overlay;
c5036e7cc93b (overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51827
diff changeset
4158 struct Lisp_Overlay *tail;
12538
5920994b14c2 (last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 12488
diff changeset
4159 /* 1 if this change is an insertion. */
5920994b14c2 (last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 12488
diff changeset
4160 int insertion = (after ? XFASTINT (arg3) == 0 : EQ (start, end));
51827
8f62ae8e410c (report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51824
diff changeset
4161 struct gcpro gcpro1, gcpro2, gcpro3, gcpro4;
7670
b3be53811505 (verify_overlay_modification): GCPRO tail and overlay.
Richard M. Stallman <rms@gnu.org>
parents: 7520
diff changeset
4162
b3be53811505 (verify_overlay_modification): GCPRO tail and overlay.
Richard M. Stallman <rms@gnu.org>
parents: 7520
diff changeset
4163 overlay = Qnil;
51844
c5036e7cc93b (overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51827
diff changeset
4164 tail = NULL;
51827
8f62ae8e410c (report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51824
diff changeset
4165
51939
d38453fdf2a0 (copy_overlays): Use EMACS_INT for positions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51867
diff changeset
4166 /* We used to run the functions as soon as we found them and only register
d38453fdf2a0 (copy_overlays): Use EMACS_INT for positions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51867
diff changeset
4167 them in last_overlay_modification_hooks for the purpose of the `after'
d38453fdf2a0 (copy_overlays): Use EMACS_INT for positions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51867
diff changeset
4168 case. But running elisp code as we traverse the list of overlays is
d38453fdf2a0 (copy_overlays): Use EMACS_INT for positions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51867
diff changeset
4169 painful because the list can be modified by the elisp code so we had to
d38453fdf2a0 (copy_overlays): Use EMACS_INT for positions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51867
diff changeset
4170 copy at several places. We now simply do a read-only traversal that
d38453fdf2a0 (copy_overlays): Use EMACS_INT for positions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51867
diff changeset
4171 only collects the functions to run and we run them afterwards. It's
d38453fdf2a0 (copy_overlays): Use EMACS_INT for positions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51867
diff changeset
4172 simpler, especially since all the code was already there. -stef */
d38453fdf2a0 (copy_overlays): Use EMACS_INT for positions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51867
diff changeset
4173
51827
8f62ae8e410c (report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51824
diff changeset
4174 if (!after)
12538
5920994b14c2 (last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 12488
diff changeset
4175 {
51827
8f62ae8e410c (report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51824
diff changeset
4176 /* We are being called before a change.
8f62ae8e410c (report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51824
diff changeset
4177 Scan the overlays to find the functions to call. */
8f62ae8e410c (report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51824
diff changeset
4178 last_overlay_modification_hooks_used = 0;
51844
c5036e7cc93b (overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51827
diff changeset
4179 for (tail = current_buffer->overlays_before; tail; tail = tail->next)
12538
5920994b14c2 (last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 12488
diff changeset
4180 {
51827
8f62ae8e410c (report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51824
diff changeset
4181 int startpos, endpos;
8f62ae8e410c (report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51824
diff changeset
4182 Lisp_Object ostart, oend;
8f62ae8e410c (report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51824
diff changeset
4183
51844
c5036e7cc93b (overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51827
diff changeset
4184 XSETMISC (overlay, tail);
51827
8f62ae8e410c (report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51824
diff changeset
4185
8f62ae8e410c (report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51824
diff changeset
4186 ostart = OVERLAY_START (overlay);
8f62ae8e410c (report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51824
diff changeset
4187 oend = OVERLAY_END (overlay);
8f62ae8e410c (report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51824
diff changeset
4188 endpos = OVERLAY_POSITION (oend);
8f62ae8e410c (report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51824
diff changeset
4189 if (XFASTINT (start) > endpos)
8f62ae8e410c (report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51824
diff changeset
4190 break;
8f62ae8e410c (report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51824
diff changeset
4191 startpos = OVERLAY_POSITION (ostart);
8f62ae8e410c (report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51824
diff changeset
4192 if (insertion && (XFASTINT (start) == startpos
8f62ae8e410c (report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51824
diff changeset
4193 || XFASTINT (end) == startpos))
6591
60f70854e73f (verify_overlay_modification):
Richard M. Stallman <rms@gnu.org>
parents: 6493
diff changeset
4194 {
51827
8f62ae8e410c (report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51824
diff changeset
4195 prop = Foverlay_get (overlay, Qinsert_in_front_hooks);
8f62ae8e410c (report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51824
diff changeset
4196 if (!NILP (prop))
8f62ae8e410c (report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51824
diff changeset
4197 add_overlay_mod_hooklist (prop, overlay);
8f62ae8e410c (report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51824
diff changeset
4198 }
8f62ae8e410c (report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51824
diff changeset
4199 if (insertion && (XFASTINT (start) == endpos
8f62ae8e410c (report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51824
diff changeset
4200 || XFASTINT (end) == endpos))
8f62ae8e410c (report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51824
diff changeset
4201 {
8f62ae8e410c (report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51824
diff changeset
4202 prop = Foverlay_get (overlay, Qinsert_behind_hooks);
8f62ae8e410c (report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51824
diff changeset
4203 if (!NILP (prop))
8f62ae8e410c (report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51824
diff changeset
4204 add_overlay_mod_hooklist (prop, overlay);
8f62ae8e410c (report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51824
diff changeset
4205 }
8f62ae8e410c (report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51824
diff changeset
4206 /* Test for intersecting intervals. This does the right thing
8f62ae8e410c (report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51824
diff changeset
4207 for both insertion and deletion. */
8f62ae8e410c (report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51824
diff changeset
4208 if (XFASTINT (end) > startpos && XFASTINT (start) < endpos)
8f62ae8e410c (report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51824
diff changeset
4209 {
8f62ae8e410c (report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51824
diff changeset
4210 prop = Foverlay_get (overlay, Qmodification_hooks);
8f62ae8e410c (report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51824
diff changeset
4211 if (!NILP (prop))
8f62ae8e410c (report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51824
diff changeset
4212 add_overlay_mod_hooklist (prop, overlay);
6591
60f70854e73f (verify_overlay_modification):
Richard M. Stallman <rms@gnu.org>
parents: 6493
diff changeset
4213 }
4077
a860278e3ab3 (verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents: 3884
diff changeset
4214 }
55242
d57364949309 (syms_of_buffer) <line-spacing>: Allow float value.
Kim F. Storm <storm@cua.dk>
parents: 55140
diff changeset
4215
51844
c5036e7cc93b (overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51827
diff changeset
4216 for (tail = current_buffer->overlays_after; tail; tail = tail->next)
4077
a860278e3ab3 (verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents: 3884
diff changeset
4217 {
51827
8f62ae8e410c (report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51824
diff changeset
4218 int startpos, endpos;
8f62ae8e410c (report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51824
diff changeset
4219 Lisp_Object ostart, oend;
8f62ae8e410c (report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51824
diff changeset
4220
51844
c5036e7cc93b (overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51827
diff changeset
4221 XSETMISC (overlay, tail);
51827
8f62ae8e410c (report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51824
diff changeset
4222
8f62ae8e410c (report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51824
diff changeset
4223 ostart = OVERLAY_START (overlay);
8f62ae8e410c (report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51824
diff changeset
4224 oend = OVERLAY_END (overlay);
8f62ae8e410c (report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51824
diff changeset
4225 startpos = OVERLAY_POSITION (ostart);
8f62ae8e410c (report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51824
diff changeset
4226 endpos = OVERLAY_POSITION (oend);
8f62ae8e410c (report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51824
diff changeset
4227 if (XFASTINT (end) < startpos)
8f62ae8e410c (report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51824
diff changeset
4228 break;
8f62ae8e410c (report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51824
diff changeset
4229 if (insertion && (XFASTINT (start) == startpos
8f62ae8e410c (report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51824
diff changeset
4230 || XFASTINT (end) == startpos))
6591
60f70854e73f (verify_overlay_modification):
Richard M. Stallman <rms@gnu.org>
parents: 6493
diff changeset
4231 {
51827
8f62ae8e410c (report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51824
diff changeset
4232 prop = Foverlay_get (overlay, Qinsert_in_front_hooks);
8f62ae8e410c (report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51824
diff changeset
4233 if (!NILP (prop))
8f62ae8e410c (report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51824
diff changeset
4234 add_overlay_mod_hooklist (prop, overlay);
6591
60f70854e73f (verify_overlay_modification):
Richard M. Stallman <rms@gnu.org>
parents: 6493
diff changeset
4235 }
51827
8f62ae8e410c (report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51824
diff changeset
4236 if (insertion && (XFASTINT (start) == endpos
8f62ae8e410c (report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51824
diff changeset
4237 || XFASTINT (end) == endpos))
6591
60f70854e73f (verify_overlay_modification):
Richard M. Stallman <rms@gnu.org>
parents: 6493
diff changeset
4238 {
51827
8f62ae8e410c (report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51824
diff changeset
4239 prop = Foverlay_get (overlay, Qinsert_behind_hooks);
8f62ae8e410c (report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51824
diff changeset
4240 if (!NILP (prop))
8f62ae8e410c (report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51824
diff changeset
4241 add_overlay_mod_hooklist (prop, overlay);
8f62ae8e410c (report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51824
diff changeset
4242 }
8f62ae8e410c (report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51824
diff changeset
4243 /* Test for intersecting intervals. This does the right thing
8f62ae8e410c (report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51824
diff changeset
4244 for both insertion and deletion. */
8f62ae8e410c (report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51824
diff changeset
4245 if (XFASTINT (end) > startpos && XFASTINT (start) < endpos)
8f62ae8e410c (report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51824
diff changeset
4246 {
8f62ae8e410c (report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51824
diff changeset
4247 prop = Foverlay_get (overlay, Qmodification_hooks);
8f62ae8e410c (report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51824
diff changeset
4248 if (!NILP (prop))
8f62ae8e410c (report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51824
diff changeset
4249 add_overlay_mod_hooklist (prop, overlay);
6591
60f70854e73f (verify_overlay_modification):
Richard M. Stallman <rms@gnu.org>
parents: 6493
diff changeset
4250 }
4077
a860278e3ab3 (verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents: 3884
diff changeset
4251 }
a860278e3ab3 (verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents: 3884
diff changeset
4252 }
a860278e3ab3 (verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents: 3884
diff changeset
4253
51827
8f62ae8e410c (report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51824
diff changeset
4254 GCPRO4 (overlay, arg1, arg2, arg3);
8f62ae8e410c (report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51824
diff changeset
4255 {
8f62ae8e410c (report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51824
diff changeset
4256 /* Call the functions recorded in last_overlay_modification_hooks.
8f62ae8e410c (report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51824
diff changeset
4257 First copy the vector contents, in case some of these hooks
8f62ae8e410c (report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51824
diff changeset
4258 do subsequent modification of the buffer. */
8f62ae8e410c (report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51824
diff changeset
4259 int size = last_overlay_modification_hooks_used;
8f62ae8e410c (report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51824
diff changeset
4260 Lisp_Object *copy = (Lisp_Object *) alloca (size * sizeof (Lisp_Object));
8f62ae8e410c (report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51824
diff changeset
4261 int i;
8f62ae8e410c (report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51824
diff changeset
4262
8f62ae8e410c (report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51824
diff changeset
4263 bcopy (XVECTOR (last_overlay_modification_hooks)->contents,
8f62ae8e410c (report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51824
diff changeset
4264 copy, size * sizeof (Lisp_Object));
8f62ae8e410c (report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51824
diff changeset
4265 gcpro1.var = copy;
8f62ae8e410c (report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51824
diff changeset
4266 gcpro1.nvars = size;
8f62ae8e410c (report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51824
diff changeset
4267
8f62ae8e410c (report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51824
diff changeset
4268 for (i = 0; i < size;)
8f62ae8e410c (report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51824
diff changeset
4269 {
8f62ae8e410c (report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51824
diff changeset
4270 Lisp_Object prop, overlay;
8f62ae8e410c (report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51824
diff changeset
4271 prop = copy[i++];
8f62ae8e410c (report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51824
diff changeset
4272 overlay = copy[i++];
8f62ae8e410c (report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51824
diff changeset
4273 call_overlay_mod_hooks (prop, overlay, after, arg1, arg2, arg3);
8f62ae8e410c (report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51824
diff changeset
4274 }
8f62ae8e410c (report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51824
diff changeset
4275 }
7670
b3be53811505 (verify_overlay_modification): GCPRO tail and overlay.
Richard M. Stallman <rms@gnu.org>
parents: 7520
diff changeset
4276 UNGCPRO;
4077
a860278e3ab3 (verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents: 3884
diff changeset
4277 }
a860278e3ab3 (verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents: 3884
diff changeset
4278
a860278e3ab3 (verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents: 3884
diff changeset
4279 static void
10146
24032289479c (report_overlay_modification): Renamed from verify_overlay_modification.
Richard M. Stallman <rms@gnu.org>
parents: 10143
diff changeset
4280 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
4281 Lisp_Object list, overlay;
24032289479c (report_overlay_modification): Renamed from verify_overlay_modification.
Richard M. Stallman <rms@gnu.org>
parents: 10143
diff changeset
4282 int after;
24032289479c (report_overlay_modification): Renamed from verify_overlay_modification.
Richard M. Stallman <rms@gnu.org>
parents: 10143
diff changeset
4283 Lisp_Object arg1, arg2, arg3;
4077
a860278e3ab3 (verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents: 3884
diff changeset
4284 {
10146
24032289479c (report_overlay_modification): Renamed from verify_overlay_modification.
Richard M. Stallman <rms@gnu.org>
parents: 10143
diff changeset
4285 struct gcpro gcpro1, gcpro2, gcpro3, gcpro4;
12538
5920994b14c2 (last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 12488
diff changeset
4286
10146
24032289479c (report_overlay_modification): Renamed from verify_overlay_modification.
Richard M. Stallman <rms@gnu.org>
parents: 10143
diff changeset
4287 GCPRO4 (list, arg1, arg2, arg3);
12538
5920994b14c2 (last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 12488
diff changeset
4288
47972
287494c5e770 (assoc_ignore_text_properties, Fother_buffer, Fkill_buffer)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 46920
diff changeset
4289 while (CONSP (list))
4077
a860278e3ab3 (verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents: 3884
diff changeset
4290 {
10146
24032289479c (report_overlay_modification): Renamed from verify_overlay_modification.
Richard M. Stallman <rms@gnu.org>
parents: 10143
diff changeset
4291 if (NILP (arg3))
47972
287494c5e770 (assoc_ignore_text_properties, Fother_buffer, Fkill_buffer)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 46920
diff changeset
4292 call4 (XCAR (list), overlay, after ? Qt : Qnil, arg1, arg2);
10146
24032289479c (report_overlay_modification): Renamed from verify_overlay_modification.
Richard M. Stallman <rms@gnu.org>
parents: 10143
diff changeset
4293 else
47972
287494c5e770 (assoc_ignore_text_properties, Fother_buffer, Fkill_buffer)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 46920
diff changeset
4294 call5 (XCAR (list), overlay, after ? Qt : Qnil, arg1, arg2, arg3);
287494c5e770 (assoc_ignore_text_properties, Fother_buffer, Fkill_buffer)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 46920
diff changeset
4295 list = XCDR (list);
4077
a860278e3ab3 (verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents: 3884
diff changeset
4296 }
a860278e3ab3 (verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents: 3884
diff changeset
4297 UNGCPRO;
a860278e3ab3 (verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents: 3884
diff changeset
4298 }
8839
41981db9ad8e (Qevaporate): New symbol.
Karl Heuer <kwzh@gnu.org>
parents: 8818
diff changeset
4299
41981db9ad8e (Qevaporate): New symbol.
Karl Heuer <kwzh@gnu.org>
parents: 8818
diff changeset
4300 /* Delete any zero-sized overlays at position POS, if the `evaporate'
41981db9ad8e (Qevaporate): New symbol.
Karl Heuer <kwzh@gnu.org>
parents: 8818
diff changeset
4301 property is set. */
41981db9ad8e (Qevaporate): New symbol.
Karl Heuer <kwzh@gnu.org>
parents: 8818
diff changeset
4302 void
41981db9ad8e (Qevaporate): New symbol.
Karl Heuer <kwzh@gnu.org>
parents: 8818
diff changeset
4303 evaporate_overlays (pos)
51824
9f5665eb77bd (reset_buffer, recenter_overlay_lists)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51782
diff changeset
4304 EMACS_INT pos;
8839
41981db9ad8e (Qevaporate): New symbol.
Karl Heuer <kwzh@gnu.org>
parents: 8818
diff changeset
4305 {
51844
c5036e7cc93b (overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51827
diff changeset
4306 Lisp_Object overlay, hit_list;
c5036e7cc93b (overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51827
diff changeset
4307 struct Lisp_Overlay *tail;
8839
41981db9ad8e (Qevaporate): New symbol.
Karl Heuer <kwzh@gnu.org>
parents: 8818
diff changeset
4308
41981db9ad8e (Qevaporate): New symbol.
Karl Heuer <kwzh@gnu.org>
parents: 8818
diff changeset
4309 hit_list = Qnil;
51824
9f5665eb77bd (reset_buffer, recenter_overlay_lists)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51782
diff changeset
4310 if (pos <= current_buffer->overlay_center)
51844
c5036e7cc93b (overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51827
diff changeset
4311 for (tail = current_buffer->overlays_before; tail; tail = tail->next)
8839
41981db9ad8e (Qevaporate): New symbol.
Karl Heuer <kwzh@gnu.org>
parents: 8818
diff changeset
4312 {
41981db9ad8e (Qevaporate): New symbol.
Karl Heuer <kwzh@gnu.org>
parents: 8818
diff changeset
4313 int endpos;
51844
c5036e7cc93b (overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51827
diff changeset
4314 XSETMISC (overlay, tail);
8839
41981db9ad8e (Qevaporate): New symbol.
Karl Heuer <kwzh@gnu.org>
parents: 8818
diff changeset
4315 endpos = OVERLAY_POSITION (OVERLAY_END (overlay));
41981db9ad8e (Qevaporate): New symbol.
Karl Heuer <kwzh@gnu.org>
parents: 8818
diff changeset
4316 if (endpos < pos)
41981db9ad8e (Qevaporate): New symbol.
Karl Heuer <kwzh@gnu.org>
parents: 8818
diff changeset
4317 break;
41981db9ad8e (Qevaporate): New symbol.
Karl Heuer <kwzh@gnu.org>
parents: 8818
diff changeset
4318 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
4319 && ! NILP (Foverlay_get (overlay, Qevaporate)))
8839
41981db9ad8e (Qevaporate): New symbol.
Karl Heuer <kwzh@gnu.org>
parents: 8818
diff changeset
4320 hit_list = Fcons (overlay, hit_list);
41981db9ad8e (Qevaporate): New symbol.
Karl Heuer <kwzh@gnu.org>
parents: 8818
diff changeset
4321 }
41981db9ad8e (Qevaporate): New symbol.
Karl Heuer <kwzh@gnu.org>
parents: 8818
diff changeset
4322 else
51844
c5036e7cc93b (overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51827
diff changeset
4323 for (tail = current_buffer->overlays_after; tail; tail = tail->next)
8839
41981db9ad8e (Qevaporate): New symbol.
Karl Heuer <kwzh@gnu.org>
parents: 8818
diff changeset
4324 {
41981db9ad8e (Qevaporate): New symbol.
Karl Heuer <kwzh@gnu.org>
parents: 8818
diff changeset
4325 int startpos;
51844
c5036e7cc93b (overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51827
diff changeset
4326 XSETMISC (overlay, tail);
8839
41981db9ad8e (Qevaporate): New symbol.
Karl Heuer <kwzh@gnu.org>
parents: 8818
diff changeset
4327 startpos = OVERLAY_POSITION (OVERLAY_START (overlay));
41981db9ad8e (Qevaporate): New symbol.
Karl Heuer <kwzh@gnu.org>
parents: 8818
diff changeset
4328 if (startpos > pos)
41981db9ad8e (Qevaporate): New symbol.
Karl Heuer <kwzh@gnu.org>
parents: 8818
diff changeset
4329 break;
41981db9ad8e (Qevaporate): New symbol.
Karl Heuer <kwzh@gnu.org>
parents: 8818
diff changeset
4330 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
4331 && ! NILP (Foverlay_get (overlay, Qevaporate)))
8839
41981db9ad8e (Qevaporate): New symbol.
Karl Heuer <kwzh@gnu.org>
parents: 8818
diff changeset
4332 hit_list = Fcons (overlay, hit_list);
41981db9ad8e (Qevaporate): New symbol.
Karl Heuer <kwzh@gnu.org>
parents: 8818
diff changeset
4333 }
26164
d39ec0a27081 more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents: 26088
diff changeset
4334 for (; CONSP (hit_list); hit_list = XCDR (hit_list))
d39ec0a27081 more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents: 26088
diff changeset
4335 Fdelete_overlay (XCAR (hit_list));
8839
41981db9ad8e (Qevaporate): New symbol.
Karl Heuer <kwzh@gnu.org>
parents: 8818
diff changeset
4336 }
4077
a860278e3ab3 (verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents: 3884
diff changeset
4337
9464
4bb620c9a075 (buffer_slot_type_mismatch): Take just the offset as argument. Only check
Karl Heuer <kwzh@gnu.org>
parents: 9438
diff changeset
4338 /* Somebody has tried to store a value with an unacceptable type
20995
abc60038dd2b (syms_of_buffer): enable-multibyte-characters is read-only.
Karl Heuer <kwzh@gnu.org>
parents: 20935
diff changeset
4339 in the slot with offset OFFSET. */
abc60038dd2b (syms_of_buffer): enable-multibyte-characters is read-only.
Karl Heuer <kwzh@gnu.org>
parents: 20935
diff changeset
4340
1001
c1ebe69206df * buffer.c (syms_of_buffer): Call DEFVAR_PER_BUFFER with the new
Jim Blandy <jimb@redhat.com>
parents: 764
diff changeset
4341 void
9464
4bb620c9a075 (buffer_slot_type_mismatch): Take just the offset as argument. Only check
Karl Heuer <kwzh@gnu.org>
parents: 9438
diff changeset
4342 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
4343 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
4344 {
9464
4bb620c9a075 (buffer_slot_type_mismatch): Take just the offset as argument. Only check
Karl Heuer <kwzh@gnu.org>
parents: 9438
diff changeset
4345 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
4346 char *type_name;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49444
diff changeset
4347
28352
1555145f8c35 (buffer_permanent_local_flags): Use MAX_PER_BUFFER_VARS
Gerd Moellmann <gerd@gnu.org>
parents: 28332
diff changeset
4348 switch (XINT (PER_BUFFER_TYPE (offset)))
1001
c1ebe69206df * buffer.c (syms_of_buffer): Call DEFVAR_PER_BUFFER with the new
Jim Blandy <jimb@redhat.com>
parents: 764
diff changeset
4349 {
28314
c46e609d887a (buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents: 28207
diff changeset
4350 case Lisp_Int:
c46e609d887a (buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents: 28207
diff changeset
4351 type_name = "integers";
c46e609d887a (buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents: 28207
diff changeset
4352 break;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49444
diff changeset
4353
28314
c46e609d887a (buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents: 28207
diff changeset
4354 case Lisp_String:
c46e609d887a (buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents: 28207
diff changeset
4355 type_name = "strings";
c46e609d887a (buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents: 28207
diff changeset
4356 break;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49444
diff changeset
4357
28314
c46e609d887a (buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents: 28207
diff changeset
4358 case Lisp_Symbol:
c46e609d887a (buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents: 28207
diff changeset
4359 type_name = "symbols";
c46e609d887a (buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents: 28207
diff changeset
4360 break;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49444
diff changeset
4361
1001
c1ebe69206df * buffer.c (syms_of_buffer): Call DEFVAR_PER_BUFFER with the new
Jim Blandy <jimb@redhat.com>
parents: 764
diff changeset
4362 default:
c1ebe69206df * buffer.c (syms_of_buffer): Call DEFVAR_PER_BUFFER with the new
Jim Blandy <jimb@redhat.com>
parents: 764
diff changeset
4363 abort ();
c1ebe69206df * buffer.c (syms_of_buffer): Call DEFVAR_PER_BUFFER with the new
Jim Blandy <jimb@redhat.com>
parents: 764
diff changeset
4364 }
c1ebe69206df * buffer.c (syms_of_buffer): Call DEFVAR_PER_BUFFER with the new
Jim Blandy <jimb@redhat.com>
parents: 764
diff changeset
4365
28352
1555145f8c35 (buffer_permanent_local_flags): Use MAX_PER_BUFFER_VARS
Gerd Moellmann <gerd@gnu.org>
parents: 28332
diff changeset
4366 sym = PER_BUFFER_SYMBOL (offset);
20995
abc60038dd2b (syms_of_buffer): enable-multibyte-characters is read-only.
Karl Heuer <kwzh@gnu.org>
parents: 20935
diff changeset
4367 error ("Only %s should be stored in the buffer-local variable %s",
46370
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46293
diff changeset
4368 type_name, SDATA (SYMBOL_NAME (sym)));
1001
c1ebe69206df * buffer.c (syms_of_buffer): Call DEFVAR_PER_BUFFER with the new
Jim Blandy <jimb@redhat.com>
parents: 764
diff changeset
4369 }
28314
c46e609d887a (buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents: 28207
diff changeset
4370
1001
c1ebe69206df * buffer.c (syms_of_buffer): Call DEFVAR_PER_BUFFER with the new
Jim Blandy <jimb@redhat.com>
parents: 764
diff changeset
4371
31604
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4372 /***********************************************************************
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4373 Allocation with mmap
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4374 ***********************************************************************/
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4375
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4376 #ifdef USE_MMAP_FOR_BUFFERS
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4377
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4378 #include <sys/types.h>
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4379 #include <sys/mman.h>
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4380
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4381 #ifndef MAP_ANON
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4382 #ifdef MAP_ANONYMOUS
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4383 #define MAP_ANON MAP_ANONYMOUS
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4384 #else
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4385 #define MAP_ANON 0
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4386 #endif
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4387 #endif
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4388
33645
e822f94eb7d9 (MAP_FAILED): Define it as `((void *) -1)' if it's
Gerd Moellmann <gerd@gnu.org>
parents: 33598
diff changeset
4389 #ifndef MAP_FAILED
e822f94eb7d9 (MAP_FAILED): Define it as `((void *) -1)' if it's
Gerd Moellmann <gerd@gnu.org>
parents: 33598
diff changeset
4390 #define MAP_FAILED ((void *) -1)
e822f94eb7d9 (MAP_FAILED): Define it as `((void *) -1)' if it's
Gerd Moellmann <gerd@gnu.org>
parents: 33598
diff changeset
4391 #endif
e822f94eb7d9 (MAP_FAILED): Define it as `((void *) -1)' if it's
Gerd Moellmann <gerd@gnu.org>
parents: 33598
diff changeset
4392
31604
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4393 #include <stdio.h>
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4394 #include <errno.h>
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4395
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4396 #if MAP_ANON == 0
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4397 #include <fcntl.h>
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4398 #endif
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4399
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4400 #include "coding.h"
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4401
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4402
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4403 /* Memory is allocated in regions which are mapped using mmap(2).
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4404 The current implementation lets the system select mapped
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4405 addresses; we're not using MAP_FIXED in general, except when
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4406 trying to enlarge regions.
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4407
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4408 Each mapped region starts with a mmap_region structure, the user
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4409 area starts after that structure, aligned to MEM_ALIGN.
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4410
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4411 +-----------------------+
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4412 | struct mmap_info + |
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4413 | padding |
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4414 +-----------------------+
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4415 | user data |
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4416 | |
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4417 | |
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4418 +-----------------------+ */
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4419
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4420 struct mmap_region
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4421 {
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4422 /* User-specified size. */
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4423 size_t nbytes_specified;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49444
diff changeset
4424
31604
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4425 /* Number of bytes mapped */
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4426 size_t nbytes_mapped;
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4427
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4428 /* Pointer to the location holding the address of the memory
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4429 allocated with the mmap'd block. The variable actually points
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4430 after this structure. */
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4431 POINTER_TYPE **var;
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4432
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4433 /* Next and previous in list of all mmap'd regions. */
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4434 struct mmap_region *next, *prev;
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4435 };
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4436
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4437 /* Doubly-linked list of mmap'd regions. */
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4438
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4439 static struct mmap_region *mmap_regions;
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4440
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4441 /* File descriptor for mmap. If we don't have anonymous mapping,
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4442 /dev/zero will be opened on it. */
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4443
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4444 static int mmap_fd;
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4445
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4446 /* Temporary storage for mmap_set_vars, see there. */
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4447
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4448 static struct mmap_region *mmap_regions_1;
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4449 static int mmap_fd_1;
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4450
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4451 /* Page size on this system. */
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4452
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4453 static int mmap_page_size;
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4454
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4455 /* 1 means mmap has been intialized. */
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4456
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4457 static int mmap_initialized_p;
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4458
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4459 /* Value is X rounded up to the next multiple of N. */
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4460
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4461 #define ROUND(X, N) (((X) + (N) - 1) / (N) * (N))
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4462
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4463 /* Size of mmap_region structure plus padding. */
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4464
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4465 #define MMAP_REGION_STRUCT_SIZE \
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4466 ROUND (sizeof (struct mmap_region), MEM_ALIGN)
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4467
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4468 /* Given a pointer P to the start of the user-visible part of a mapped
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4469 region, return a pointer to the start of the region. */
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4470
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4471 #define MMAP_REGION(P) \
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4472 ((struct mmap_region *) ((char *) (P) - MMAP_REGION_STRUCT_SIZE))
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4473
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4474 /* Given a pointer P to the start of a mapped region, return a pointer
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4475 to the start of the user-visible part of the region. */
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4476
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4477 #define MMAP_USER_AREA(P) \
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4478 ((POINTER_TYPE *) ((char *) (P) + MMAP_REGION_STRUCT_SIZE))
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4479
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4480 #define MEM_ALIGN sizeof (double)
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4481
48090
b7e13d33cf41 Comment.
Dave Love <fx@gnu.org>
parents: 47972
diff changeset
4482 /* Predicate returning true if part of the address range [START .. END]
b7e13d33cf41 Comment.
Dave Love <fx@gnu.org>
parents: 47972
diff changeset
4483 is currently mapped. Used to prevent overwriting an existing
44617
c54f8a37564e (MMAP_ALLOCATED_P): New macro to be set from system
Gerd Moellmann <gerd@gnu.org>
parents: 43712
diff changeset
4484 memory mapping.
c54f8a37564e (MMAP_ALLOCATED_P): New macro to be set from system
Gerd Moellmann <gerd@gnu.org>
parents: 43712
diff changeset
4485
c54f8a37564e (MMAP_ALLOCATED_P): New macro to be set from system
Gerd Moellmann <gerd@gnu.org>
parents: 43712
diff changeset
4486 Default is to conservativly assume the address range is occupied by
c54f8a37564e (MMAP_ALLOCATED_P): New macro to be set from system
Gerd Moellmann <gerd@gnu.org>
parents: 43712
diff changeset
4487 something else. This can be overridden by system configuration
c54f8a37564e (MMAP_ALLOCATED_P): New macro to be set from system
Gerd Moellmann <gerd@gnu.org>
parents: 43712
diff changeset
4488 files if system-specific means to determine this exists. */
c54f8a37564e (MMAP_ALLOCATED_P): New macro to be set from system
Gerd Moellmann <gerd@gnu.org>
parents: 43712
diff changeset
4489
c54f8a37564e (MMAP_ALLOCATED_P): New macro to be set from system
Gerd Moellmann <gerd@gnu.org>
parents: 43712
diff changeset
4490 #ifndef MMAP_ALLOCATED_P
c54f8a37564e (MMAP_ALLOCATED_P): New macro to be set from system
Gerd Moellmann <gerd@gnu.org>
parents: 43712
diff changeset
4491 #define MMAP_ALLOCATED_P(start, end) 1
c54f8a37564e (MMAP_ALLOCATED_P): New macro to be set from system
Gerd Moellmann <gerd@gnu.org>
parents: 43712
diff changeset
4492 #endif
c54f8a37564e (MMAP_ALLOCATED_P): New macro to be set from system
Gerd Moellmann <gerd@gnu.org>
parents: 43712
diff changeset
4493
31604
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4494 /* Function prototypes. */
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4495
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4496 static int mmap_free_1 P_ ((struct mmap_region *));
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4497 static int mmap_enlarge P_ ((struct mmap_region *, int));
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4498 static struct mmap_region *mmap_find P_ ((POINTER_TYPE *, POINTER_TYPE *));
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4499 static POINTER_TYPE *mmap_alloc P_ ((POINTER_TYPE **, size_t));
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4500 static POINTER_TYPE *mmap_realloc P_ ((POINTER_TYPE **, size_t));
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4501 static void mmap_free P_ ((POINTER_TYPE **ptr));
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4502 static void mmap_init P_ ((void));
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4503
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4504
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4505 /* Return a region overlapping address range START...END, or null if
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4506 none. END is not including, i.e. the last byte in the range
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4507 is at END - 1. */
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4508
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4509 static struct mmap_region *
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4510 mmap_find (start, end)
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4511 POINTER_TYPE *start, *end;
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4512 {
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4513 struct mmap_region *r;
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4514 char *s = (char *) start, *e = (char *) end;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49444
diff changeset
4515
31604
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4516 for (r = mmap_regions; r; r = r->next)
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4517 {
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4518 char *rstart = (char *) r;
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4519 char *rend = rstart + r->nbytes_mapped;
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4520
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4521 if (/* First byte of range, i.e. START, in this region? */
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4522 (s >= rstart && s < rend)
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4523 /* Last byte of range, i.e. END - 1, in this region? */
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4524 || (e > rstart && e <= rend)
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4525 /* First byte of this region in the range? */
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4526 || (rstart >= s && rstart < e)
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4527 /* Last byte of this region in the range? */
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4528 || (rend > s && rend <= e))
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4529 break;
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4530 }
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4531
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4532 return r;
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4533 }
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4534
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4535
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4536 /* Unmap a region. P is a pointer to the start of the user-araa of
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4537 the region. Value is non-zero if successful. */
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4538
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4539 static int
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4540 mmap_free_1 (r)
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4541 struct mmap_region *r;
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4542 {
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4543 if (r->next)
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4544 r->next->prev = r->prev;
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4545 if (r->prev)
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4546 r->prev->next = r->next;
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4547 else
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4548 mmap_regions = r->next;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49444
diff changeset
4549
33675
cd12ade4547d (mmap_free_1): Avoid a compiler warning.
Gerd Moellmann <gerd@gnu.org>
parents: 33645
diff changeset
4550 if (munmap ((POINTER_TYPE *) r, r->nbytes_mapped) == -1)
31604
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4551 {
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4552 fprintf (stderr, "munmap: %s\n", emacs_strerror (errno));
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4553 return 0;
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4554 }
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4555
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4556 return 1;
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4557 }
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4558
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4559
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4560 /* Enlarge region R by NPAGES pages. NPAGES < 0 means shrink R.
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4561 Value is non-zero if successful. */
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4562
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4563 static int
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4564 mmap_enlarge (r, npages)
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4565 struct mmap_region *r;
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4566 int npages;
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4567 {
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4568 char *region_end = (char *) r + r->nbytes_mapped;
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4569 size_t nbytes;
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4570 int success = 0;
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4571
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4572 if (npages < 0)
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4573 {
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4574 /* Unmap pages at the end of the region. */
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4575 nbytes = - npages * mmap_page_size;
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4576 if (munmap (region_end - nbytes, nbytes) == -1)
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4577 fprintf (stderr, "munmap: %s\n", emacs_strerror (errno));
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4578 else
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4579 {
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4580 r->nbytes_mapped -= nbytes;
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4581 success = 1;
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4582 }
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4583 }
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4584 else if (npages > 0)
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4585 {
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4586 nbytes = npages * mmap_page_size;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49444
diff changeset
4587
31604
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4588 /* Try to map additional pages at the end of the region. We
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4589 cannot do this if the address range is already occupied by
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4590 something else because mmap deletes any previous mapping.
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4591 I'm not sure this is worth doing, let's see. */
44617
c54f8a37564e (MMAP_ALLOCATED_P): New macro to be set from system
Gerd Moellmann <gerd@gnu.org>
parents: 43712
diff changeset
4592 if (!MMAP_ALLOCATED_P (region_end, region_end + nbytes))
31604
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4593 {
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4594 POINTER_TYPE *p;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49444
diff changeset
4595
31604
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4596 p = mmap (region_end, nbytes, PROT_READ | PROT_WRITE,
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4597 MAP_ANON | MAP_PRIVATE | MAP_FIXED, mmap_fd, 0);
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4598 if (p == MAP_FAILED)
33598
d2ed1317ec06 (mmap_enlarge): Don't print a message on stderr
Gerd Moellmann <gerd@gnu.org>
parents: 32856
diff changeset
4599 ; /* fprintf (stderr, "mmap: %s\n", emacs_strerror (errno)); */
31604
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4600 else if (p != (POINTER_TYPE *) region_end)
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4601 {
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4602 /* Kernels are free to choose a different address. In
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4603 that case, unmap what we've mapped above; we have
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4604 no use for it. */
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4605 if (munmap (p, nbytes) == -1)
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4606 fprintf (stderr, "munmap: %s\n", emacs_strerror (errno));
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4607 }
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4608 else
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4609 {
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4610 r->nbytes_mapped += nbytes;
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4611 success = 1;
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4612 }
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4613 }
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4614 }
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4615
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4616 return success;
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4617 }
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4618
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4619
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4620 /* Set or reset variables holding references to mapped regions. If
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4621 RESTORE_P is zero, set all variables to null. If RESTORE_P is
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4622 non-zero, set all variables to the start of the user-areas
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4623 of mapped regions.
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4624
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4625 This function is called from Fdump_emacs to ensure that the dumped
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4626 Emacs doesn't contain references to memory that won't be mapped
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4627 when Emacs starts. */
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4628
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4629 void
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4630 mmap_set_vars (restore_p)
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4631 int restore_p;
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4632 {
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4633 struct mmap_region *r;
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4634
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4635 if (restore_p)
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4636 {
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4637 mmap_regions = mmap_regions_1;
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4638 mmap_fd = mmap_fd_1;
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4639 for (r = mmap_regions; r; r = r->next)
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4640 *r->var = MMAP_USER_AREA (r);
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4641 }
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4642 else
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4643 {
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4644 for (r = mmap_regions; r; r = r->next)
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4645 *r->var = NULL;
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4646 mmap_regions_1 = mmap_regions;
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4647 mmap_regions = NULL;
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4648 mmap_fd_1 = mmap_fd;
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4649 mmap_fd = -1;
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4650 }
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4651 }
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4652
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4653
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4654 /* Allocate a block of storage large enough to hold NBYTES bytes of
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4655 data. A pointer to the data is returned in *VAR. VAR is thus the
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4656 address of some variable which will use the data area.
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4657
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4658 The allocation of 0 bytes is valid.
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4659
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4660 If we can't allocate the necessary memory, set *VAR to null, and
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4661 return null. */
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4662
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4663 static POINTER_TYPE *
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4664 mmap_alloc (var, nbytes)
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4665 POINTER_TYPE **var;
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4666 size_t nbytes;
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4667 {
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4668 void *p;
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4669 size_t map;
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4670
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4671 mmap_init ();
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4672
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4673 map = ROUND (nbytes + MMAP_REGION_STRUCT_SIZE, mmap_page_size);
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4674 p = mmap (NULL, map, PROT_READ | PROT_WRITE, MAP_ANON | MAP_PRIVATE,
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4675 mmap_fd, 0);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49444
diff changeset
4676
31604
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4677 if (p == MAP_FAILED)
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4678 {
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4679 if (errno != ENOMEM)
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4680 fprintf (stderr, "mmap: %s\n", emacs_strerror (errno));
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4681 p = NULL;
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4682 }
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4683 else
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4684 {
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4685 struct mmap_region *r = (struct mmap_region *) p;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49444
diff changeset
4686
31604
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4687 r->nbytes_specified = nbytes;
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4688 r->nbytes_mapped = map;
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4689 r->var = var;
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4690 r->prev = NULL;
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4691 r->next = mmap_regions;
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4692 if (r->next)
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4693 r->next->prev = r;
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4694 mmap_regions = r;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49444
diff changeset
4695
31604
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4696 p = MMAP_USER_AREA (p);
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4697 }
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49444
diff changeset
4698
31604
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4699 return *var = p;
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4700 }
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4701
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4702
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4703 /* Given a pointer at address VAR to data allocated with mmap_alloc,
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4704 resize it to size NBYTES. Change *VAR to reflect the new block,
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4705 and return this value. If more memory cannot be allocated, then
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4706 leave *VAR unchanged, and return null. */
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4707
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4708 static POINTER_TYPE *
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4709 mmap_realloc (var, nbytes)
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4710 POINTER_TYPE **var;
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4711 size_t nbytes;
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4712 {
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4713 POINTER_TYPE *result;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49444
diff changeset
4714
31604
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4715 mmap_init ();
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4716
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4717 if (*var == NULL)
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4718 result = mmap_alloc (var, nbytes);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49444
diff changeset
4719 else if (nbytes == 0)
31604
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4720 {
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4721 mmap_free (var);
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4722 result = mmap_alloc (var, nbytes);
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4723 }
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4724 else
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4725 {
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4726 struct mmap_region *r = MMAP_REGION (*var);
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4727 size_t room = r->nbytes_mapped - MMAP_REGION_STRUCT_SIZE;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49444
diff changeset
4728
31604
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4729 if (room < nbytes)
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4730 {
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4731 /* Must enlarge. */
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4732 POINTER_TYPE *old_ptr = *var;
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4733
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4734 /* Try to map additional pages at the end of the region.
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4735 If that fails, allocate a new region, copy data
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4736 from the old region, then free it. */
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4737 if (mmap_enlarge (r, (ROUND (nbytes - room, mmap_page_size)
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4738 / mmap_page_size)))
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4739 {
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4740 r->nbytes_specified = nbytes;
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4741 *var = result = old_ptr;
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4742 }
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4743 else if (mmap_alloc (var, nbytes))
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4744 {
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4745 bcopy (old_ptr, *var, r->nbytes_specified);
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4746 mmap_free_1 (MMAP_REGION (old_ptr));
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4747 result = *var;
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4748 r = MMAP_REGION (result);
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4749 r->nbytes_specified = nbytes;
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4750 }
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4751 else
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4752 {
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4753 *var = old_ptr;
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4754 result = NULL;
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4755 }
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4756 }
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4757 else if (room - nbytes >= mmap_page_size)
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4758 {
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4759 /* Shrinking by at least a page. Let's give some
46588
c725edd73e4c comment last change
Ken Raeburn <raeburn@raeburn.org>
parents: 46585
diff changeset
4760 memory back to the system.
c725edd73e4c comment last change
Ken Raeburn <raeburn@raeburn.org>
parents: 46585
diff changeset
4761
c725edd73e4c comment last change
Ken Raeburn <raeburn@raeburn.org>
parents: 46585
diff changeset
4762 The extra parens are to make the division happens first,
c725edd73e4c comment last change
Ken Raeburn <raeburn@raeburn.org>
parents: 46585
diff changeset
4763 on positive values, so we know it will round towards
c725edd73e4c comment last change
Ken Raeburn <raeburn@raeburn.org>
parents: 46585
diff changeset
4764 zero. */
46585
8d0730b0e14c (mmap_realloc): When shrinking, make sure number of
Ken Raeburn <raeburn@raeburn.org>
parents: 46445
diff changeset
4765 mmap_enlarge (r, - ((room - nbytes) / mmap_page_size));
31604
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4766 result = *var;
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4767 r->nbytes_specified = nbytes;
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4768 }
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4769 else
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4770 {
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4771 /* Leave it alone. */
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4772 result = *var;
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4773 r->nbytes_specified = nbytes;
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4774 }
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4775 }
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4776
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4777 return result;
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4778 }
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4779
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4780
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4781 /* Free a block of relocatable storage whose data is pointed to by
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4782 PTR. Store 0 in *PTR to show there's no block allocated. */
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4783
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4784 static void
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4785 mmap_free (var)
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4786 POINTER_TYPE **var;
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4787 {
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4788 mmap_init ();
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49444
diff changeset
4789
31604
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4790 if (*var)
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4791 {
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4792 mmap_free_1 (MMAP_REGION (*var));
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4793 *var = NULL;
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4794 }
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4795 }
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4796
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4797
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4798 /* Perform necessary intializations for the use of mmap. */
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4799
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4800 static void
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4801 mmap_init ()
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4802 {
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4803 #if MAP_ANON == 0
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4804 /* The value of mmap_fd is initially 0 in temacs, and -1
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4805 in a dumped Emacs. */
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4806 if (mmap_fd <= 0)
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4807 {
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4808 /* No anonymous mmap -- we need the file descriptor. */
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4809 mmap_fd = open ("/dev/zero", O_RDONLY);
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4810 if (mmap_fd == -1)
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4811 fatal ("Cannot open /dev/zero: %s", emacs_strerror (errno));
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4812 }
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4813 #endif /* MAP_ANON == 0 */
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4814
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4815 if (mmap_initialized_p)
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4816 return;
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4817 mmap_initialized_p = 1;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49444
diff changeset
4818
31604
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4819 #if MAP_ANON != 0
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4820 mmap_fd = -1;
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4821 #endif
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49444
diff changeset
4822
31604
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4823 mmap_page_size = getpagesize ();
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4824 }
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4825
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4826 #endif /* USE_MMAP_FOR_BUFFERS */
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4827
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4828
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4829
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4830 /***********************************************************************
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4831 Buffer-text Allocation
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4832 ***********************************************************************/
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4833
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4834 #ifdef REL_ALLOC
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4835 extern POINTER_TYPE *r_alloc P_ ((POINTER_TYPE **, size_t));
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4836 extern POINTER_TYPE *r_re_alloc P_ ((POINTER_TYPE **, size_t));
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4837 extern void r_alloc_free P_ ((POINTER_TYPE **ptr));
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4838 #endif /* REL_ALLOC */
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4839
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4840
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4841 /* Allocate NBYTES bytes for buffer B's text buffer. */
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4842
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4843 static void
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4844 alloc_buffer_text (b, nbytes)
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4845 struct buffer *b;
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4846 size_t nbytes;
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4847 {
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4848 POINTER_TYPE *p;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49444
diff changeset
4849
31604
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4850 BLOCK_INPUT;
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4851 #if defined USE_MMAP_FOR_BUFFERS
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4852 p = mmap_alloc ((POINTER_TYPE **) &b->text->beg, nbytes);
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4853 #elif defined REL_ALLOC
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4854 p = r_alloc ((POINTER_TYPE **) &b->text->beg, nbytes);
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4855 #else
31612
2050f93e8cef (alloc_buffer_text): Fix xmalloc call.
Dave Love <fx@gnu.org>
parents: 31604
diff changeset
4856 p = xmalloc (nbytes);
31604
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4857 #endif
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49444
diff changeset
4858
31604
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4859 if (p == NULL)
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4860 {
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4861 UNBLOCK_INPUT;
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4862 memory_full ();
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4863 }
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4864
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4865 b->text->beg = (unsigned char *) p;
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4866 UNBLOCK_INPUT;
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4867 }
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4868
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4869 /* Enlarge buffer B's text buffer by DELTA bytes. DELTA < 0 means
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4870 shrink it. */
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4871
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4872 void
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4873 enlarge_buffer_text (b, delta)
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4874 struct buffer *b;
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4875 int delta;
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4876 {
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4877 POINTER_TYPE *p;
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4878 size_t nbytes = (BUF_Z_BYTE (b) - BUF_BEG_BYTE (b) + BUF_GAP_SIZE (b) + 1
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4879 + delta);
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4880 BLOCK_INPUT;
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4881 #if defined USE_MMAP_FOR_BUFFERS
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4882 p = mmap_realloc ((POINTER_TYPE **) &b->text->beg, nbytes);
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4883 #elif defined REL_ALLOC
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4884 p = r_re_alloc ((POINTER_TYPE **) &b->text->beg, nbytes);
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4885 #else
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4886 p = xrealloc (b->text->beg, nbytes);
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4887 #endif
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49444
diff changeset
4888
31604
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4889 if (p == NULL)
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4890 {
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4891 UNBLOCK_INPUT;
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4892 memory_full ();
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4893 }
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4894
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4895 BUF_BEG_ADDR (b) = (unsigned char *) p;
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4896 UNBLOCK_INPUT;
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4897 }
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4898
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4899
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4900 /* Free buffer B's text buffer. */
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4901
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4902 static void
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4903 free_buffer_text (b)
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4904 struct buffer *b;
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4905 {
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4906 BLOCK_INPUT;
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4907
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4908 #if defined USE_MMAP_FOR_BUFFERS
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4909 mmap_free ((POINTER_TYPE **) &b->text->beg);
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4910 #elif defined REL_ALLOC
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4911 r_alloc_free ((POINTER_TYPE **) &b->text->beg);
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4912 #else
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4913 xfree (b->text->beg);
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4914 #endif
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49444
diff changeset
4915
31604
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4916 BUF_BEG_ADDR (b) = NULL;
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4917 UNBLOCK_INPUT;
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4918 }
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4919
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4920
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4921
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4922 /***********************************************************************
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4923 Initialization
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4924 ***********************************************************************/
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4925
21514
fa9ff387d260 Fix -Wimplicit warnings.
Andreas Schwab <schwab@suse.de>
parents: 21506
diff changeset
4926 void
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
4927 init_buffer_once ()
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
4928 {
28314
c46e609d887a (buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents: 28207
diff changeset
4929 int idx;
c46e609d887a (buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents: 28207
diff changeset
4930
c46e609d887a (buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents: 28207
diff changeset
4931 bzero (buffer_permanent_local_flags, sizeof buffer_permanent_local_flags);
15776
6018e01d4466 (buffer_permanent_local_flags): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 15638
diff changeset
4932
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
4933 /* Make sure all markable slots in buffer_defaults
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
4934 are initialized reasonably, so mark_buffer won't choke. */
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
4935 reset_buffer (&buffer_defaults);
15776
6018e01d4466 (buffer_permanent_local_flags): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 15638
diff changeset
4936 reset_buffer_local_variables (&buffer_defaults, 1);
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
4937 reset_buffer (&buffer_local_symbols);
15776
6018e01d4466 (buffer_permanent_local_flags): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 15638
diff changeset
4938 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
4939 /* Prevent GC from getting confused. */
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
4940 buffer_defaults.text = &buffer_defaults.own_text;
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
4941 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
4942 BUF_INTERVALS (&buffer_defaults) = 0;
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
4943 BUF_INTERVALS (&buffer_local_symbols) = 0;
9262
582534b6e763 (Fget_buffer_create, Frename_buffer, Fbuffer_disable_undo,
Karl Heuer <kwzh@gnu.org>
parents: 9211
diff changeset
4944 XSETBUFFER (Vbuffer_defaults, &buffer_defaults);
582534b6e763 (Fget_buffer_create, Frename_buffer, Fbuffer_disable_undo,
Karl Heuer <kwzh@gnu.org>
parents: 9211
diff changeset
4945 XSETBUFFER (Vbuffer_local_symbols, &buffer_local_symbols);
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
4946
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
4947 /* Set up the default values of various buffer slots. */
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
4948 /* Must do these before making the first buffer! */
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
4949
28636
19c81f320db5 (Fmake_indirect_buffer): Escape newline in doc.
Dave Love <fx@gnu.org>
parents: 28625
diff changeset
4950 /* real setup is done in bindings.el */
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
4951 buffer_defaults.mode_line_format = build_string ("%-");
25546
Gerd Moellmann <gerd@gnu.org>
parents: 25508
diff changeset
4952 buffer_defaults.header_line_format = Qnil;
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
4953 buffer_defaults.abbrev_mode = Qnil;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
4954 buffer_defaults.overwrite_mode = Qnil;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
4955 buffer_defaults.case_fold_search = Qt;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
4956 buffer_defaults.auto_fill_function = Qnil;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
4957 buffer_defaults.selective_display = Qnil;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
4958 #ifndef old
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
4959 buffer_defaults.selective_display_ellipses = Qt;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
4960 #endif
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
4961 buffer_defaults.abbrev_table = Qnil;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
4962 buffer_defaults.display_table = Qnil;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
4963 buffer_defaults.undo_list = Qnil;
2043
a1ab3501653c (reset_buffer_local_variables): Reset mark_active.
Richard M. Stallman <rms@gnu.org>
parents: 2020
diff changeset
4964 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
4965 buffer_defaults.file_format = Qnil;
56976
b3aa8cb4c381 (reset_buffer, init_buffer_once): Handle auto_save_file_format field.
Luc Teirlinck <teirllm@auburn.edu>
parents: 56669
diff changeset
4966 buffer_defaults.auto_save_file_format = Qt;
51844
c5036e7cc93b (overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51827
diff changeset
4967 buffer_defaults.overlays_before = NULL;
c5036e7cc93b (overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51827
diff changeset
4968 buffer_defaults.overlays_after = NULL;
51824
9f5665eb77bd (reset_buffer, recenter_overlay_lists)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51782
diff changeset
4969 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
4970
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
4971 XSETFASTINT (buffer_defaults.tab_width, 8);
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
4972 buffer_defaults.truncate_lines = Qnil;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
4973 buffer_defaults.ctl_arrow = Qt;
17022
907fb167f7de Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16840
diff changeset
4974 buffer_defaults.direction_reversed = Qnil;
28322
986882bafaf1 (reset_buffer): Initialize buffer's cursor_type.
Gerd Moellmann <gerd@gnu.org>
parents: 28314
diff changeset
4975 buffer_defaults.cursor_type = Qt;
28688
3c44b2f54f82 (init_buffer_once): Handle extra_line_spacing.
Gerd Moellmann <gerd@gnu.org>
parents: 28636
diff changeset
4976 buffer_defaults.extra_line_spacing = Qnil;
62069
a0a348c8b14b (init_buffer_once): Set cursor_in_non_selected_windows default value.
Kim F. Storm <storm@cua.dk>
parents: 62030
diff changeset
4977 buffer_defaults.cursor_in_non_selected_windows = Qt;
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
4978
9785
a72386110d83 (init_buffer): Use DIRECTORY_SEP, IS_DIRECTORY_SEP macros,
Richard M. Stallman <rms@gnu.org>
parents: 9732
diff changeset
4979 #ifdef DOS_NT
7270
0f79f4bd3c62 (init_buffer_once): Initialize buffer_file_type field right.
Richard M. Stallman <rms@gnu.org>
parents: 7062
diff changeset
4980 buffer_defaults.buffer_file_type = Qnil; /* TEXT */
5502
2b48fd9bc80e [MSDOS]: New buffer-local variable:
Richard M. Stallman <rms@gnu.org>
parents: 5433
diff changeset
4981 #endif
17124
fdad8ea24563 (init_buffer_once): Make member
Kenichi Handa <handa@m17n.org>
parents: 17022
diff changeset
4982 buffer_defaults.enable_multibyte_characters = Qt;
18178
b45b431879bf (init_buffer_once): Inititialize the member
Kenichi Handa <handa@m17n.org>
parents: 18105
diff changeset
4983 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
4984 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
4985 XSETFASTINT (buffer_defaults.left_margin, 0);
9403
9f797989b817 * buffer.c: #include region-cache.h.
Jim Blandy <jimb@redhat.com>
parents: 9362
diff changeset
4986 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
4987 buffer_defaults.file_truename = Qnil;
17218
a57ca25e9c62 (reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents: 17124
diff changeset
4988 XSETFASTINT (buffer_defaults.display_count, 0);
51190
17af4bfeb062 (init_buffer_once): Set buffer_defaults and
Kim F. Storm <storm@cua.dk>
parents: 51166
diff changeset
4989 XSETFASTINT (buffer_defaults.left_margin_cols, 0);
17af4bfeb062 (init_buffer_once): Set buffer_defaults and
Kim F. Storm <storm@cua.dk>
parents: 51166
diff changeset
4990 XSETFASTINT (buffer_defaults.right_margin_cols, 0);
17af4bfeb062 (init_buffer_once): Set buffer_defaults and
Kim F. Storm <storm@cua.dk>
parents: 51166
diff changeset
4991 buffer_defaults.left_fringe_width = Qnil;
17af4bfeb062 (init_buffer_once): Set buffer_defaults and
Kim F. Storm <storm@cua.dk>
parents: 51166
diff changeset
4992 buffer_defaults.right_fringe_width = Qnil;
17af4bfeb062 (init_buffer_once): Set buffer_defaults and
Kim F. Storm <storm@cua.dk>
parents: 51166
diff changeset
4993 buffer_defaults.fringes_outside_margins = Qnil;
17af4bfeb062 (init_buffer_once): Set buffer_defaults and
Kim F. Storm <storm@cua.dk>
parents: 51166
diff changeset
4994 buffer_defaults.scroll_bar_width = Qnil;
17af4bfeb062 (init_buffer_once): Set buffer_defaults and
Kim F. Storm <storm@cua.dk>
parents: 51166
diff changeset
4995 buffer_defaults.vertical_scroll_bar_type = Qt;
25021
7a31786a0335 (init_buffer_once): Init top_line_format.
Gerd Moellmann <gerd@gnu.org>
parents: 24975
diff changeset
4996 buffer_defaults.indicate_empty_lines = Qnil;
53602
4c14b3c50a31 (init_buffer_once): Set buffer_defaults and
Kim F. Storm <storm@cua.dk>
parents: 53350
diff changeset
4997 buffer_defaults.indicate_buffer_boundaries = Qnil;
25021
7a31786a0335 (init_buffer_once): Init top_line_format.
Gerd Moellmann <gerd@gnu.org>
parents: 24975
diff changeset
4998 buffer_defaults.scroll_up_aggressively = Qnil;
7a31786a0335 (init_buffer_once): Init top_line_format.
Gerd Moellmann <gerd@gnu.org>
parents: 24975
diff changeset
4999 buffer_defaults.scroll_down_aggressively = Qnil;
22150
b6edeb61a779 (syms_of_buffer): Set up Lisp variable buffer-display-time.
Richard M. Stallman <rms@gnu.org>
parents: 22023
diff changeset
5000 buffer_defaults.display_time = Qnil;
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5001
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5002 /* Assign the local-flags to the slots that have default values.
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5003 The local flag is a bit that is used in the buffer
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5004 to say that it has its own local value for the slot.
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5005 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
5006
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5007 /* 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
5008 if (sizeof (EMACS_INT) != sizeof (Lisp_Object)) abort ();
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5009
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5010 /* 0 means not a lisp var, -1 means always local, else mask */
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5011 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
5012 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
5013 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
5014 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
5015 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
5016 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
5017 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
5018 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
5019 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
5020 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
5021 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
5022 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
5023 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
5024 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
5025 XSETINT (buffer_local_flags.file_format, -1);
56976
b3aa8cb4c381 (reset_buffer, init_buffer_once): Handle auto_save_file_format field.
Luc Teirlinck <teirllm@auburn.edu>
parents: 56669
diff changeset
5026 XSETINT (buffer_local_flags.auto_save_file_format, -1);
17218
a57ca25e9c62 (reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents: 17124
diff changeset
5027 XSETINT (buffer_local_flags.display_count, -1);
22150
b6edeb61a779 (syms_of_buffer): Set up Lisp variable buffer-display-time.
Richard M. Stallman <rms@gnu.org>
parents: 22023
diff changeset
5028 XSETINT (buffer_local_flags.display_time, -1);
20995
abc60038dd2b (syms_of_buffer): enable-multibyte-characters is read-only.
Karl Heuer <kwzh@gnu.org>
parents: 20935
diff changeset
5029 XSETINT (buffer_local_flags.enable_multibyte_characters, -1);
9296
a1a7fc21ded9 (reset_buffer, Ferase_buffer, validate_region, list_buffers_1, recenter_overlay_lists, init_buffer_once): Don't use XFASTINT as an lvalue.
Karl Heuer <kwzh@gnu.org>
parents: 9262
diff changeset
5030
28314
c46e609d887a (buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents: 28207
diff changeset
5031 idx = 1;
c46e609d887a (buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents: 28207
diff changeset
5032 XSETFASTINT (buffer_local_flags.mode_line_format, idx); ++idx;
c46e609d887a (buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents: 28207
diff changeset
5033 XSETFASTINT (buffer_local_flags.abbrev_mode, idx); ++idx;
c46e609d887a (buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents: 28207
diff changeset
5034 XSETFASTINT (buffer_local_flags.overwrite_mode, idx); ++idx;
c46e609d887a (buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents: 28207
diff changeset
5035 XSETFASTINT (buffer_local_flags.case_fold_search, idx); ++idx;
c46e609d887a (buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents: 28207
diff changeset
5036 XSETFASTINT (buffer_local_flags.auto_fill_function, idx); ++idx;
c46e609d887a (buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents: 28207
diff changeset
5037 XSETFASTINT (buffer_local_flags.selective_display, idx); ++idx;
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5038 #ifndef old
28314
c46e609d887a (buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents: 28207
diff changeset
5039 XSETFASTINT (buffer_local_flags.selective_display_ellipses, idx); ++idx;
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5040 #endif
28314
c46e609d887a (buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents: 28207
diff changeset
5041 XSETFASTINT (buffer_local_flags.tab_width, idx); ++idx;
c46e609d887a (buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents: 28207
diff changeset
5042 XSETFASTINT (buffer_local_flags.truncate_lines, idx); ++idx;
c46e609d887a (buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents: 28207
diff changeset
5043 XSETFASTINT (buffer_local_flags.ctl_arrow, idx); ++idx;
c46e609d887a (buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents: 28207
diff changeset
5044 XSETFASTINT (buffer_local_flags.fill_column, idx); ++idx;
c46e609d887a (buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents: 28207
diff changeset
5045 XSETFASTINT (buffer_local_flags.left_margin, idx); ++idx;
c46e609d887a (buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents: 28207
diff changeset
5046 XSETFASTINT (buffer_local_flags.abbrev_table, idx); ++idx;
c46e609d887a (buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents: 28207
diff changeset
5047 XSETFASTINT (buffer_local_flags.display_table, idx); ++idx;
9785
a72386110d83 (init_buffer): Use DIRECTORY_SEP, IS_DIRECTORY_SEP macros,
Richard M. Stallman <rms@gnu.org>
parents: 9732
diff changeset
5048 #ifdef DOS_NT
28314
c46e609d887a (buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents: 28207
diff changeset
5049 XSETFASTINT (buffer_local_flags.buffer_file_type, idx);
15776
6018e01d4466 (buffer_permanent_local_flags): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 15638
diff changeset
5050 /* Make this one a permanent local. */
28314
c46e609d887a (buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents: 28207
diff changeset
5051 buffer_permanent_local_flags[idx++] = 1;
5502
2b48fd9bc80e [MSDOS]: New buffer-local variable:
Richard M. Stallman <rms@gnu.org>
parents: 5433
diff changeset
5052 #endif
28314
c46e609d887a (buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents: 28207
diff changeset
5053 XSETFASTINT (buffer_local_flags.syntax_table, idx); ++idx;
c46e609d887a (buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents: 28207
diff changeset
5054 XSETFASTINT (buffer_local_flags.cache_long_line_scans, idx); ++idx;
c46e609d887a (buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents: 28207
diff changeset
5055 XSETFASTINT (buffer_local_flags.category_table, idx); ++idx;
c46e609d887a (buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents: 28207
diff changeset
5056 XSETFASTINT (buffer_local_flags.direction_reversed, idx); ++idx;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49444
diff changeset
5057 XSETFASTINT (buffer_local_flags.buffer_file_coding_system, idx);
17124
fdad8ea24563 (init_buffer_once): Make member
Kenichi Handa <handa@m17n.org>
parents: 17022
diff changeset
5058 /* Make this one a permanent local. */
28314
c46e609d887a (buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents: 28207
diff changeset
5059 buffer_permanent_local_flags[idx++] = 1;
51190
17af4bfeb062 (init_buffer_once): Set buffer_defaults and
Kim F. Storm <storm@cua.dk>
parents: 51166
diff changeset
5060 XSETFASTINT (buffer_local_flags.left_margin_cols, idx); ++idx;
17af4bfeb062 (init_buffer_once): Set buffer_defaults and
Kim F. Storm <storm@cua.dk>
parents: 51166
diff changeset
5061 XSETFASTINT (buffer_local_flags.right_margin_cols, idx); ++idx;
17af4bfeb062 (init_buffer_once): Set buffer_defaults and
Kim F. Storm <storm@cua.dk>
parents: 51166
diff changeset
5062 XSETFASTINT (buffer_local_flags.left_fringe_width, idx); ++idx;
17af4bfeb062 (init_buffer_once): Set buffer_defaults and
Kim F. Storm <storm@cua.dk>
parents: 51166
diff changeset
5063 XSETFASTINT (buffer_local_flags.right_fringe_width, idx); ++idx;
17af4bfeb062 (init_buffer_once): Set buffer_defaults and
Kim F. Storm <storm@cua.dk>
parents: 51166
diff changeset
5064 XSETFASTINT (buffer_local_flags.fringes_outside_margins, idx); ++idx;
17af4bfeb062 (init_buffer_once): Set buffer_defaults and
Kim F. Storm <storm@cua.dk>
parents: 51166
diff changeset
5065 XSETFASTINT (buffer_local_flags.scroll_bar_width, idx); ++idx;
17af4bfeb062 (init_buffer_once): Set buffer_defaults and
Kim F. Storm <storm@cua.dk>
parents: 51166
diff changeset
5066 XSETFASTINT (buffer_local_flags.vertical_scroll_bar_type, idx); ++idx;
28314
c46e609d887a (buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents: 28207
diff changeset
5067 XSETFASTINT (buffer_local_flags.indicate_empty_lines, idx); ++idx;
53602
4c14b3c50a31 (init_buffer_once): Set buffer_defaults and
Kim F. Storm <storm@cua.dk>
parents: 53350
diff changeset
5068 XSETFASTINT (buffer_local_flags.indicate_buffer_boundaries, idx); ++idx;
28314
c46e609d887a (buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents: 28207
diff changeset
5069 XSETFASTINT (buffer_local_flags.scroll_up_aggressively, idx); ++idx;
c46e609d887a (buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents: 28207
diff changeset
5070 XSETFASTINT (buffer_local_flags.scroll_down_aggressively, idx); ++idx;
c46e609d887a (buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents: 28207
diff changeset
5071 XSETFASTINT (buffer_local_flags.header_line_format, idx); ++idx;
28332
8abeccb78576 (syms_of_buffer): Add default-cursor-type.
Gerd Moellmann <gerd@gnu.org>
parents: 28322
diff changeset
5072 XSETFASTINT (buffer_local_flags.cursor_type, idx); ++idx;
28688
3c44b2f54f82 (init_buffer_once): Handle extra_line_spacing.
Gerd Moellmann <gerd@gnu.org>
parents: 28636
diff changeset
5073 XSETFASTINT (buffer_local_flags.extra_line_spacing, idx); ++idx;
62030
bc82609e1655 (syms_of_buffer): Define cursor-in-non-selected-windows.
Richard M. Stallman <rms@gnu.org>
parents: 61445
diff changeset
5074 XSETFASTINT (buffer_local_flags.cursor_in_non_selected_windows, idx); ++idx;
28314
c46e609d887a (buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents: 28207
diff changeset
5075
c46e609d887a (buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents: 28207
diff changeset
5076 /* Need more room? */
28352
1555145f8c35 (buffer_permanent_local_flags): Use MAX_PER_BUFFER_VARS
Gerd Moellmann <gerd@gnu.org>
parents: 28332
diff changeset
5077 if (idx >= MAX_PER_BUFFER_VARS)
28314
c46e609d887a (buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents: 28207
diff changeset
5078 abort ();
28352
1555145f8c35 (buffer_permanent_local_flags): Use MAX_PER_BUFFER_VARS
Gerd Moellmann <gerd@gnu.org>
parents: 28332
diff changeset
5079 last_per_buffer_idx = idx;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49444
diff changeset
5080
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5081 Vbuffer_alist = Qnil;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5082 current_buffer = 0;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5083 all_buffers = 0;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5084
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5085 QSFundamental = build_string ("Fundamental");
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5086
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5087 Qfundamental_mode = intern ("fundamental-mode");
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5088 buffer_defaults.major_mode = Qfundamental_mode;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5089
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5090 Qmode_class = intern ("mode-class");
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5091
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5092 Qprotected_field = intern ("protected-field");
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5093
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5094 Qpermanent_local = intern ("permanent-local");
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5095
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5096 Qkill_buffer_hook = intern ("kill-buffer-hook");
51431
5fc6a7035dd3 (init_buffer_once): Make kill-buffer-hook permanent-local.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51394
diff changeset
5097 Fput (Qkill_buffer_hook, Qpermanent_local, Qt);
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5098
48635
2a9a1d761581 (Qucs_set_table_for_input): New.
Dave Love <fx@gnu.org>
parents: 48355
diff changeset
5099 Qucs_set_table_for_input = intern ("ucs-set-table-for-input");
2a9a1d761581 (Qucs_set_table_for_input): New.
Dave Love <fx@gnu.org>
parents: 48355
diff changeset
5100
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5101 Vprin1_to_string_buffer = Fget_buffer_create (build_string (" prin1"));
14396
c486932b7301 Whitespace change.
Richard M. Stallman <rms@gnu.org>
parents: 14226
diff changeset
5102
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5103 /* super-magic invisible buffer */
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5104 Vbuffer_alist = Qnil;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5105
648
70b112526394 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 585
diff changeset
5106 Fset_buffer (Fget_buffer_create (build_string ("*scratch*")));
23399
e80c5f687340 (inhibit_modification_hooks): New variable.
Kenichi Handa <handa@m17n.org>
parents: 23174
diff changeset
5107
e80c5f687340 (inhibit_modification_hooks): New variable.
Kenichi Handa <handa@m17n.org>
parents: 23174
diff changeset
5108 inhibit_modification_hooks = 0;
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5109 }
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5110
21514
fa9ff387d260 Fix -Wimplicit warnings.
Andreas Schwab <schwab@suse.de>
parents: 21506
diff changeset
5111 void
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5112 init_buffer ()
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5113 {
1563
e721339972b0 * buffer.c (init_buffer): If PWD is accurate, use it instead of
Jim Blandy <jimb@redhat.com>
parents: 1501
diff changeset
5114 char *pwd;
e721339972b0 * buffer.c (init_buffer): If PWD is accurate, use it instead of
Jim Blandy <jimb@redhat.com>
parents: 1501
diff changeset
5115 struct stat dotstat, pwdstat;
3463
aa78c7babb8e (init_buffer): Init default-directory of minibuffer.
Richard M. Stallman <rms@gnu.org>
parents: 3329
diff changeset
5116 Lisp_Object temp;
9785
a72386110d83 (init_buffer): Use DIRECTORY_SEP, IS_DIRECTORY_SEP macros,
Richard M. Stallman <rms@gnu.org>
parents: 9732
diff changeset
5117 int rc;
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5118
31604
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
5119 #ifdef USE_MMAP_FOR_BUFFERS
31412
828b2b8afdc0 (init_buffer) [REL_ALLOC_MMAP]: Map new buffer
Gerd Moellmann <gerd@gnu.org>
parents: 31395
diff changeset
5120 {
828b2b8afdc0 (init_buffer) [REL_ALLOC_MMAP]: Map new buffer
Gerd Moellmann <gerd@gnu.org>
parents: 31395
diff changeset
5121 /* When using the ralloc implementation based on mmap(2), buffer
828b2b8afdc0 (init_buffer) [REL_ALLOC_MMAP]: Map new buffer
Gerd Moellmann <gerd@gnu.org>
parents: 31395
diff changeset
5122 text pointers will have been set to null in the dumped Emacs.
828b2b8afdc0 (init_buffer) [REL_ALLOC_MMAP]: Map new buffer
Gerd Moellmann <gerd@gnu.org>
parents: 31395
diff changeset
5123 Map new memory. */
828b2b8afdc0 (init_buffer) [REL_ALLOC_MMAP]: Map new buffer
Gerd Moellmann <gerd@gnu.org>
parents: 31395
diff changeset
5124 struct buffer *b;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49444
diff changeset
5125
31412
828b2b8afdc0 (init_buffer) [REL_ALLOC_MMAP]: Map new buffer
Gerd Moellmann <gerd@gnu.org>
parents: 31395
diff changeset
5126 for (b = all_buffers; b; b = b->next)
828b2b8afdc0 (init_buffer) [REL_ALLOC_MMAP]: Map new buffer
Gerd Moellmann <gerd@gnu.org>
parents: 31395
diff changeset
5127 if (b->text->beg == NULL)
31604
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
5128 enlarge_buffer_text (b, 0);
31412
828b2b8afdc0 (init_buffer) [REL_ALLOC_MMAP]: Map new buffer
Gerd Moellmann <gerd@gnu.org>
parents: 31395
diff changeset
5129 }
31604
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
5130 #endif /* USE_MMAP_FOR_BUFFERS */
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49444
diff changeset
5131
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5132 Fset_buffer (Fget_buffer_create (build_string ("*scratch*")));
21141
e30cebe8ae7c (init_buffer): Call Fset_buffer_multibyte for *scratch*.
Richard M. Stallman <rms@gnu.org>
parents: 21085
diff changeset
5133 if (NILP (buffer_defaults.enable_multibyte_characters))
e30cebe8ae7c (init_buffer): Call Fset_buffer_multibyte for *scratch*.
Richard M. Stallman <rms@gnu.org>
parents: 21085
diff changeset
5134 Fset_buffer_multibyte (Qnil);
1563
e721339972b0 * buffer.c (init_buffer): If PWD is accurate, use it instead of
Jim Blandy <jimb@redhat.com>
parents: 1501
diff changeset
5135
65411
29cca0143d6f (init_buffer): Use get_current_dir_name.
Eli Zaretskii <eliz@gnu.org>
parents: 64770
diff changeset
5136 pwd = get_current_dir_name ();
65422
c832bf03b2b2 (init_buffer): Fix error message for failed call to get_current_dir_name.
Eli Zaretskii <eliz@gnu.org>
parents: 65411
diff changeset
5137
65438
170f43effa81 (init_buffer): Grow buffer to add directory separator
Romain Francoise <romain@orebokech.com>
parents: 65422
diff changeset
5138 if (!pwd)
65422
c832bf03b2b2 (init_buffer): Fix error message for failed call to get_current_dir_name.
Eli Zaretskii <eliz@gnu.org>
parents: 65411
diff changeset
5139 fatal ("`get_current_dir_name' failed: %s\n", strerror (errno));
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5140
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5141 #ifndef VMS
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5142 /* Maybe this should really use some standard subroutine
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5143 whose definition is filename syntax dependent. */
65411
29cca0143d6f (init_buffer): Use get_current_dir_name.
Eli Zaretskii <eliz@gnu.org>
parents: 64770
diff changeset
5144 rc = strlen (pwd);
29cca0143d6f (init_buffer): Use get_current_dir_name.
Eli Zaretskii <eliz@gnu.org>
parents: 64770
diff changeset
5145 if (!(IS_DIRECTORY_SEP (pwd[rc - 1])))
9785
a72386110d83 (init_buffer): Use DIRECTORY_SEP, IS_DIRECTORY_SEP macros,
Richard M. Stallman <rms@gnu.org>
parents: 9732
diff changeset
5146 {
65438
170f43effa81 (init_buffer): Grow buffer to add directory separator
Romain Francoise <romain@orebokech.com>
parents: 65422
diff changeset
5147 /* Grow buffer to add directory separator and '\0'. */
170f43effa81 (init_buffer): Grow buffer to add directory separator
Romain Francoise <romain@orebokech.com>
parents: 65422
diff changeset
5148 pwd = (char *) xrealloc (pwd, rc + 2);
65411
29cca0143d6f (init_buffer): Use get_current_dir_name.
Eli Zaretskii <eliz@gnu.org>
parents: 64770
diff changeset
5149 pwd[rc] = DIRECTORY_SEP;
29cca0143d6f (init_buffer): Use get_current_dir_name.
Eli Zaretskii <eliz@gnu.org>
parents: 64770
diff changeset
5150 pwd[rc + 1] = '\0';
9785
a72386110d83 (init_buffer): Use DIRECTORY_SEP, IS_DIRECTORY_SEP macros,
Richard M. Stallman <rms@gnu.org>
parents: 9732
diff changeset
5151 }
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5152 #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
5153
65411
29cca0143d6f (init_buffer): Use get_current_dir_name.
Eli Zaretskii <eliz@gnu.org>
parents: 64770
diff changeset
5154 current_buffer->directory = make_unibyte_string (pwd, strlen (pwd));
58618
567ca4ca8574 (init_buffer): Set current_buffer->directory to a
Kenichi Handa <handa@m17n.org>
parents: 58501
diff changeset
5155 if (! NILP (buffer_defaults.enable_multibyte_characters))
65439
1ffe6d4d0fc4 (init_buffer): Fix typos.
Romain Francoise <romain@orebokech.com>
parents: 65438
diff changeset
5156 /* At this moment, we still don't know how to decode the
65438
170f43effa81 (init_buffer): Grow buffer to add directory separator
Romain Francoise <romain@orebokech.com>
parents: 65422
diff changeset
5157 directory name. So, we keep the bytes in multibyte form so
58618
567ca4ca8574 (init_buffer): Set current_buffer->directory to a
Kenichi Handa <handa@m17n.org>
parents: 58501
diff changeset
5158 that ENCODE_FILE correctly gets the original bytes. */
567ca4ca8574 (init_buffer): Set current_buffer->directory to a
Kenichi Handa <handa@m17n.org>
parents: 58501
diff changeset
5159 current_buffer->directory
567ca4ca8574 (init_buffer): Set current_buffer->directory to a
Kenichi Handa <handa@m17n.org>
parents: 58501
diff changeset
5160 = string_to_multibyte (current_buffer->directory);
3463
aa78c7babb8e (init_buffer): Init default-directory of minibuffer.
Richard M. Stallman <rms@gnu.org>
parents: 3329
diff changeset
5161
16384
4ec13b05b0fa (init_buffer): Add /: to dir names that could be magic.
Richard M. Stallman <rms@gnu.org>
parents: 16370
diff changeset
5162 /* 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
5163 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
5164 temp = Ffind_file_name_handler (current_buffer->directory, Qt);
20080
52fbf5fad62e (init_buffer): Don't add /: to default dir if it's `/'.
Karl Heuer <kwzh@gnu.org>
parents: 19977
diff changeset
5165 if (! NILP (temp)
52fbf5fad62e (init_buffer): Don't add /: to default dir if it's `/'.
Karl Heuer <kwzh@gnu.org>
parents: 19977
diff changeset
5166 /* If the default dir is just /, TEMP is non-nil
52fbf5fad62e (init_buffer): Don't add /: to default dir if it's `/'.
Karl Heuer <kwzh@gnu.org>
parents: 19977
diff changeset
5167 because of the ange-ftp completion handler.
52fbf5fad62e (init_buffer): Don't add /: to default dir if it's `/'.
Karl Heuer <kwzh@gnu.org>
parents: 19977
diff changeset
5168 However, it is not necessary to turn / into /:/.
52fbf5fad62e (init_buffer): Don't add /: to default dir if it's `/'.
Karl Heuer <kwzh@gnu.org>
parents: 19977
diff changeset
5169 So avoid doing that. */
46370
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46293
diff changeset
5170 && strcmp ("/", SDATA (current_buffer->directory)))
16384
4ec13b05b0fa (init_buffer): Add /: to dir names that could be magic.
Richard M. Stallman <rms@gnu.org>
parents: 16370
diff changeset
5171 current_buffer->directory
4ec13b05b0fa (init_buffer): Add /: to dir names that could be magic.
Richard M. Stallman <rms@gnu.org>
parents: 16370
diff changeset
5172 = 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
5173
3463
aa78c7babb8e (init_buffer): Init default-directory of minibuffer.
Richard M. Stallman <rms@gnu.org>
parents: 3329
diff changeset
5174 temp = get_minibuffer (0);
aa78c7babb8e (init_buffer): Init default-directory of minibuffer.
Richard M. Stallman <rms@gnu.org>
parents: 3329
diff changeset
5175 XBUFFER (temp)->directory = current_buffer->directory;
65411
29cca0143d6f (init_buffer): Use get_current_dir_name.
Eli Zaretskii <eliz@gnu.org>
parents: 64770
diff changeset
5176
29cca0143d6f (init_buffer): Use get_current_dir_name.
Eli Zaretskii <eliz@gnu.org>
parents: 64770
diff changeset
5177 free (pwd);
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5178 }
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5179
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5180 /* initialize the buffer routines */
21514
fa9ff387d260 Fix -Wimplicit warnings.
Andreas Schwab <schwab@suse.de>
parents: 21506
diff changeset
5181 void
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5182 syms_of_buffer ()
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5183 {
12538
5920994b14c2 (last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 12488
diff changeset
5184 staticpro (&last_overlay_modification_hooks);
5920994b14c2 (last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 12488
diff changeset
5185 last_overlay_modification_hooks
5920994b14c2 (last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 12488
diff changeset
5186 = Fmake_vector (make_number (10), Qnil);
5920994b14c2 (last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 12488
diff changeset
5187
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5188 staticpro (&Vbuffer_defaults);
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5189 staticpro (&Vbuffer_local_symbols);
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5190 staticpro (&Qfundamental_mode);
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5191 staticpro (&Qmode_class);
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5192 staticpro (&QSFundamental);
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5193 staticpro (&Vbuffer_alist);
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5194 staticpro (&Qprotected_field);
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5195 staticpro (&Qpermanent_local);
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5196 staticpro (&Qkill_buffer_hook);
12785
937df231678c (Qbefore_change_functions, Qafter_change_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 12699
diff changeset
5197 Qoverlayp = intern ("overlayp");
2776
8bf3bb4c20dd * lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents: 2722
diff changeset
5198 staticpro (&Qoverlayp);
8839
41981db9ad8e (Qevaporate): New symbol.
Karl Heuer <kwzh@gnu.org>
parents: 8818
diff changeset
5199 Qevaporate = intern ("evaporate");
41981db9ad8e (Qevaporate): New symbol.
Karl Heuer <kwzh@gnu.org>
parents: 8818
diff changeset
5200 staticpro (&Qevaporate);
12785
937df231678c (Qbefore_change_functions, Qafter_change_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 12699
diff changeset
5201 Qmodification_hooks = intern ("modification-hooks");
4213
616036bb2427 (Qmodification_hooks, Qinsert_in_front_hooks)
Richard M. Stallman <rms@gnu.org>
parents: 4100
diff changeset
5202 staticpro (&Qmodification_hooks);
616036bb2427 (Qmodification_hooks, Qinsert_in_front_hooks)
Richard M. Stallman <rms@gnu.org>
parents: 4100
diff changeset
5203 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
5204 staticpro (&Qinsert_in_front_hooks);
4213
616036bb2427 (Qmodification_hooks, Qinsert_in_front_hooks)
Richard M. Stallman <rms@gnu.org>
parents: 4100
diff changeset
5205 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
5206 staticpro (&Qinsert_behind_hooks);
937df231678c (Qbefore_change_functions, Qafter_change_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 12699
diff changeset
5207 Qget_file_buffer = intern ("get-file-buffer");
5433
7ac1e6f1565f Don't include syntax.h.
Richard M. Stallman <rms@gnu.org>
parents: 5247
diff changeset
5208 staticpro (&Qget_file_buffer);
5857
03f8720af7fb (sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents: 5703
diff changeset
5209 Qpriority = intern ("priority");
03f8720af7fb (sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents: 5703
diff changeset
5210 staticpro (&Qpriority);
03f8720af7fb (sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents: 5703
diff changeset
5211 Qwindow = intern ("window");
03f8720af7fb (sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents: 5703
diff changeset
5212 staticpro (&Qwindow);
11693
efef31f1c42d (Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents: 11659
diff changeset
5213 Qbefore_string = intern ("before-string");
efef31f1c42d (Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents: 11659
diff changeset
5214 staticpro (&Qbefore_string);
efef31f1c42d (Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents: 11659
diff changeset
5215 Qafter_string = intern ("after-string");
efef31f1c42d (Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents: 11659
diff changeset
5216 staticpro (&Qafter_string);
12785
937df231678c (Qbefore_change_functions, Qafter_change_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 12699
diff changeset
5217 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
5218 staticpro (&Qfirst_change_hook);
937df231678c (Qbefore_change_functions, Qafter_change_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 12699
diff changeset
5219 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
5220 staticpro (&Qbefore_change_functions);
937df231678c (Qbefore_change_functions, Qafter_change_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 12699
diff changeset
5221 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
5222 staticpro (&Qafter_change_functions);
48635
2a9a1d761581 (Qucs_set_table_for_input): New.
Dave Love <fx@gnu.org>
parents: 48355
diff changeset
5223 staticpro (&Qucs_set_table_for_input);
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5224
50014
3b2576528809 (Fkill_buffer): Use Frun_hook_with_args_until_failure
Richard M. Stallman <rms@gnu.org>
parents: 49974
diff changeset
5225 Qkill_buffer_query_functions = intern ("kill-buffer-query-functions");
3b2576528809 (Fkill_buffer): Use Frun_hook_with_args_until_failure
Richard M. Stallman <rms@gnu.org>
parents: 49974
diff changeset
5226 staticpro (&Qkill_buffer_query_functions);
3b2576528809 (Fkill_buffer): Use Frun_hook_with_args_until_failure
Richard M. Stallman <rms@gnu.org>
parents: 49974
diff changeset
5227
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5228 Fput (Qprotected_field, Qerror_conditions,
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5229 Fcons (Qprotected_field, Fcons (Qerror, Qnil)));
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5230 Fput (Qprotected_field, Qerror_message,
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5231 build_string ("Attempt to modify a protected field"));
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5232
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5233 /* All these use DEFVAR_LISP_NOPRO because the slots in
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5234 buffer_defaults will all be marked via Vbuffer_defaults. */
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5235
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5236 DEFVAR_LISP_NOPRO ("default-mode-line-format",
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39974
diff changeset
5237 &buffer_defaults.mode_line_format,
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39974
diff changeset
5238 doc: /* Default value of `mode-line-format' for buffers that don't override it.
39971
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5239 This is the same as (default-value 'mode-line-format). */);
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5240
25546
Gerd Moellmann <gerd@gnu.org>
parents: 25508
diff changeset
5241 DEFVAR_LISP_NOPRO ("default-header-line-format",
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39974
diff changeset
5242 &buffer_defaults.header_line_format,
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39974
diff changeset
5243 doc: /* Default value of `header-line-format' for buffers that don't override it.
39971
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5244 This is the same as (default-value 'header-line-format). */);
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5245
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39974
diff changeset
5246 DEFVAR_LISP_NOPRO ("default-cursor-type", &buffer_defaults.cursor_type,
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39974
diff changeset
5247 doc: /* Default value of `cursor-type' for buffers that don't override it.
39971
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5248 This is the same as (default-value 'cursor-type). */);
28332
8abeccb78576 (syms_of_buffer): Add default-cursor-type.
Gerd Moellmann <gerd@gnu.org>
parents: 28322
diff changeset
5249
28688
3c44b2f54f82 (init_buffer_once): Handle extra_line_spacing.
Gerd Moellmann <gerd@gnu.org>
parents: 28636
diff changeset
5250 DEFVAR_LISP_NOPRO ("default-line-spacing",
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39974
diff changeset
5251 &buffer_defaults.extra_line_spacing,
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39974
diff changeset
5252 doc: /* Default value of `line-spacing' for buffers that don't override it.
39971
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5253 This is the same as (default-value 'line-spacing). */);
28688
3c44b2f54f82 (init_buffer_once): Handle extra_line_spacing.
Gerd Moellmann <gerd@gnu.org>
parents: 28636
diff changeset
5254
62069
a0a348c8b14b (init_buffer_once): Set cursor_in_non_selected_windows default value.
Kim F. Storm <storm@cua.dk>
parents: 62030
diff changeset
5255 DEFVAR_LISP_NOPRO ("default-cursor-in-non-selected-windows",
a0a348c8b14b (init_buffer_once): Set cursor_in_non_selected_windows default value.
Kim F. Storm <storm@cua.dk>
parents: 62030
diff changeset
5256 &buffer_defaults.cursor_in_non_selected_windows,
a0a348c8b14b (init_buffer_once): Set cursor_in_non_selected_windows default value.
Kim F. Storm <storm@cua.dk>
parents: 62030
diff changeset
5257 doc: /* Default value of `cursor-in-non-selected-windows'.
a0a348c8b14b (init_buffer_once): Set cursor_in_non_selected_windows default value.
Kim F. Storm <storm@cua.dk>
parents: 62030
diff changeset
5258 This is the same as (default-value 'cursor-in-non-selected-windows). */);
a0a348c8b14b (init_buffer_once): Set cursor_in_non_selected_windows default value.
Kim F. Storm <storm@cua.dk>
parents: 62030
diff changeset
5259
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5260 DEFVAR_LISP_NOPRO ("default-abbrev-mode",
40108
6084dfa5f85d Reindent DEFUNs and DEFVARs woth doc: keywords.
Pavel Janík <Pavel@Janik.cz>
parents: 39988
diff changeset
5261 &buffer_defaults.abbrev_mode,
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39974
diff changeset
5262 doc: /* Default value of `abbrev-mode' for buffers that do not override it.
39971
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5263 This is the same as (default-value 'abbrev-mode). */);
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5264
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5265 DEFVAR_LISP_NOPRO ("default-ctl-arrow",
40108
6084dfa5f85d Reindent DEFUNs and DEFVARs woth doc: keywords.
Pavel Janík <Pavel@Janik.cz>
parents: 39988
diff changeset
5266 &buffer_defaults.ctl_arrow,
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39974
diff changeset
5267 doc: /* Default value of `ctl-arrow' for buffers that do not override it.
39971
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5268 This is the same as (default-value 'ctl-arrow). */);
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5269
62793
71f6142fcfb9 (Fbuffer_local_value): Make argument name match its use in docstring.
Juanma Barranquero <lekktu@gmail.com>
parents: 62069
diff changeset
5270 DEFVAR_LISP_NOPRO ("default-direction-reversed",
71f6142fcfb9 (Fbuffer_local_value): Make argument name match its use in docstring.
Juanma Barranquero <lekktu@gmail.com>
parents: 62069
diff changeset
5271 &buffer_defaults.direction_reversed,
71f6142fcfb9 (Fbuffer_local_value): Make argument name match its use in docstring.
Juanma Barranquero <lekktu@gmail.com>
parents: 62069
diff changeset
5272 doc: /* Default value of `direction-reversed' for buffers that do not override it.
39971
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5273 This is the same as (default-value 'direction-reversed). */);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49444
diff changeset
5274
62793
71f6142fcfb9 (Fbuffer_local_value): Make argument name match its use in docstring.
Juanma Barranquero <lekktu@gmail.com>
parents: 62069
diff changeset
5275 DEFVAR_LISP_NOPRO ("default-enable-multibyte-characters",
71f6142fcfb9 (Fbuffer_local_value): Make argument name match its use in docstring.
Juanma Barranquero <lekktu@gmail.com>
parents: 62069
diff changeset
5276 &buffer_defaults.enable_multibyte_characters,
71f6142fcfb9 (Fbuffer_local_value): Make argument name match its use in docstring.
Juanma Barranquero <lekktu@gmail.com>
parents: 62069
diff changeset
5277 doc: /* *Default value of `enable-multibyte-characters' for buffers not overriding it.
39971
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5278 This is the same as (default-value 'enable-multibyte-characters). */);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49444
diff changeset
5279
62793
71f6142fcfb9 (Fbuffer_local_value): Make argument name match its use in docstring.
Juanma Barranquero <lekktu@gmail.com>
parents: 62069
diff changeset
5280 DEFVAR_LISP_NOPRO ("default-buffer-file-coding-system",
71f6142fcfb9 (Fbuffer_local_value): Make argument name match its use in docstring.
Juanma Barranquero <lekktu@gmail.com>
parents: 62069
diff changeset
5281 &buffer_defaults.buffer_file_coding_system,
71f6142fcfb9 (Fbuffer_local_value): Make argument name match its use in docstring.
Juanma Barranquero <lekktu@gmail.com>
parents: 62069
diff changeset
5282 doc: /* Default value of `buffer-file-coding-system' for buffers not overriding it.
39971
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5283 This is the same as (default-value 'buffer-file-coding-system). */);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49444
diff changeset
5284
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5285 DEFVAR_LISP_NOPRO ("default-truncate-lines",
40108
6084dfa5f85d Reindent DEFUNs and DEFVARs woth doc: keywords.
Pavel Janík <Pavel@Janik.cz>
parents: 39988
diff changeset
5286 &buffer_defaults.truncate_lines,
6084dfa5f85d Reindent DEFUNs and DEFVARs woth doc: keywords.
Pavel Janík <Pavel@Janik.cz>
parents: 39988
diff changeset
5287 doc: /* Default value of `truncate-lines' for buffers that do not override it.
39971
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5288 This is the same as (default-value 'truncate-lines). */);
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5289
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5290 DEFVAR_LISP_NOPRO ("default-fill-column",
40108
6084dfa5f85d Reindent DEFUNs and DEFVARs woth doc: keywords.
Pavel Janík <Pavel@Janik.cz>
parents: 39988
diff changeset
5291 &buffer_defaults.fill_column,
6084dfa5f85d Reindent DEFUNs and DEFVARs woth doc: keywords.
Pavel Janík <Pavel@Janik.cz>
parents: 39988
diff changeset
5292 doc: /* Default value of `fill-column' for buffers that do not override it.
39971
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5293 This is the same as (default-value 'fill-column). */);
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5294
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5295 DEFVAR_LISP_NOPRO ("default-left-margin",
40108
6084dfa5f85d Reindent DEFUNs and DEFVARs woth doc: keywords.
Pavel Janík <Pavel@Janik.cz>
parents: 39988
diff changeset
5296 &buffer_defaults.left_margin,
6084dfa5f85d Reindent DEFUNs and DEFVARs woth doc: keywords.
Pavel Janík <Pavel@Janik.cz>
parents: 39988
diff changeset
5297 doc: /* Default value of `left-margin' for buffers that do not override it.
39971
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5298 This is the same as (default-value 'left-margin). */);
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5299
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5300 DEFVAR_LISP_NOPRO ("default-tab-width",
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39974
diff changeset
5301 &buffer_defaults.tab_width,
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39974
diff changeset
5302 doc: /* Default value of `tab-width' for buffers that do not override it.
39971
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5303 This is the same as (default-value 'tab-width). */);
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5304
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5305 DEFVAR_LISP_NOPRO ("default-case-fold-search",
40108
6084dfa5f85d Reindent DEFUNs and DEFVARs woth doc: keywords.
Pavel Janík <Pavel@Janik.cz>
parents: 39988
diff changeset
5306 &buffer_defaults.case_fold_search,
6084dfa5f85d Reindent DEFUNs and DEFVARs woth doc: keywords.
Pavel Janík <Pavel@Janik.cz>
parents: 39988
diff changeset
5307 doc: /* Default value of `case-fold-search' for buffers that don't override it.
39971
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5308 This is the same as (default-value 'case-fold-search). */);
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5309
9785
a72386110d83 (init_buffer): Use DIRECTORY_SEP, IS_DIRECTORY_SEP macros,
Richard M. Stallman <rms@gnu.org>
parents: 9732
diff changeset
5310 #ifdef DOS_NT
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49444
diff changeset
5311 DEFVAR_LISP_NOPRO ("default-buffer-file-type",
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39974
diff changeset
5312 &buffer_defaults.buffer_file_type,
40108
6084dfa5f85d Reindent DEFUNs and DEFVARs woth doc: keywords.
Pavel Janík <Pavel@Janik.cz>
parents: 39988
diff changeset
5313 doc: /* Default file type for buffers that do not override it.
39971
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5314 This is the same as (default-value 'buffer-file-type).
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5315 The file type is nil for text, t for binary. */);
5502
2b48fd9bc80e [MSDOS]: New buffer-local variable:
Richard M. Stallman <rms@gnu.org>
parents: 5433
diff changeset
5316 #endif
2b48fd9bc80e [MSDOS]: New buffer-local variable:
Richard M. Stallman <rms@gnu.org>
parents: 5433
diff changeset
5317
25021
7a31786a0335 (init_buffer_once): Init top_line_format.
Gerd Moellmann <gerd@gnu.org>
parents: 24975
diff changeset
5318 DEFVAR_LISP_NOPRO ("default-left-margin-width",
51190
17af4bfeb062 (init_buffer_once): Set buffer_defaults and
Kim F. Storm <storm@cua.dk>
parents: 51166
diff changeset
5319 &buffer_defaults.left_margin_cols,
40108
6084dfa5f85d Reindent DEFUNs and DEFVARs woth doc: keywords.
Pavel Janík <Pavel@Janik.cz>
parents: 39988
diff changeset
5320 doc: /* Default value of `left-margin-width' for buffers that don't override it.
39971
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5321 This is the same as (default-value 'left-margin-width). */);
25021
7a31786a0335 (init_buffer_once): Init top_line_format.
Gerd Moellmann <gerd@gnu.org>
parents: 24975
diff changeset
5322
7a31786a0335 (init_buffer_once): Init top_line_format.
Gerd Moellmann <gerd@gnu.org>
parents: 24975
diff changeset
5323 DEFVAR_LISP_NOPRO ("default-right-margin-width",
51190
17af4bfeb062 (init_buffer_once): Set buffer_defaults and
Kim F. Storm <storm@cua.dk>
parents: 51166
diff changeset
5324 &buffer_defaults.right_margin_cols,
17af4bfeb062 (init_buffer_once): Set buffer_defaults and
Kim F. Storm <storm@cua.dk>
parents: 51166
diff changeset
5325 doc: /* Default value of `right-margin-width' for buffers that don't override it.
39971
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5326 This is the same as (default-value 'right-margin-width). */);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49444
diff changeset
5327
51190
17af4bfeb062 (init_buffer_once): Set buffer_defaults and
Kim F. Storm <storm@cua.dk>
parents: 51166
diff changeset
5328 DEFVAR_LISP_NOPRO ("default-left-fringe-width",
17af4bfeb062 (init_buffer_once): Set buffer_defaults and
Kim F. Storm <storm@cua.dk>
parents: 51166
diff changeset
5329 &buffer_defaults.left_fringe_width,
17af4bfeb062 (init_buffer_once): Set buffer_defaults and
Kim F. Storm <storm@cua.dk>
parents: 51166
diff changeset
5330 doc: /* Default value of `left-fringe-width' for buffers that don't override it.
17af4bfeb062 (init_buffer_once): Set buffer_defaults and
Kim F. Storm <storm@cua.dk>
parents: 51166
diff changeset
5331 This is the same as (default-value 'left-fringe-width). */);
17af4bfeb062 (init_buffer_once): Set buffer_defaults and
Kim F. Storm <storm@cua.dk>
parents: 51166
diff changeset
5332
17af4bfeb062 (init_buffer_once): Set buffer_defaults and
Kim F. Storm <storm@cua.dk>
parents: 51166
diff changeset
5333 DEFVAR_LISP_NOPRO ("default-right-fringe-width",
17af4bfeb062 (init_buffer_once): Set buffer_defaults and
Kim F. Storm <storm@cua.dk>
parents: 51166
diff changeset
5334 &buffer_defaults.right_fringe_width,
17af4bfeb062 (init_buffer_once): Set buffer_defaults and
Kim F. Storm <storm@cua.dk>
parents: 51166
diff changeset
5335 doc: /* Default value of `right-fringe-width' for buffers that don't override it.
17af4bfeb062 (init_buffer_once): Set buffer_defaults and
Kim F. Storm <storm@cua.dk>
parents: 51166
diff changeset
5336 This is the same as (default-value 'right-fringe-width). */);
17af4bfeb062 (init_buffer_once): Set buffer_defaults and
Kim F. Storm <storm@cua.dk>
parents: 51166
diff changeset
5337
17af4bfeb062 (init_buffer_once): Set buffer_defaults and
Kim F. Storm <storm@cua.dk>
parents: 51166
diff changeset
5338 DEFVAR_LISP_NOPRO ("default-fringes-outside-margins",
17af4bfeb062 (init_buffer_once): Set buffer_defaults and
Kim F. Storm <storm@cua.dk>
parents: 51166
diff changeset
5339 &buffer_defaults.fringes_outside_margins,
17af4bfeb062 (init_buffer_once): Set buffer_defaults and
Kim F. Storm <storm@cua.dk>
parents: 51166
diff changeset
5340 doc: /* Default value of `fringes-outside-margins' for buffers that don't override it.
17af4bfeb062 (init_buffer_once): Set buffer_defaults and
Kim F. Storm <storm@cua.dk>
parents: 51166
diff changeset
5341 This is the same as (default-value 'fringes-outside-margins). */);
17af4bfeb062 (init_buffer_once): Set buffer_defaults and
Kim F. Storm <storm@cua.dk>
parents: 51166
diff changeset
5342
17af4bfeb062 (init_buffer_once): Set buffer_defaults and
Kim F. Storm <storm@cua.dk>
parents: 51166
diff changeset
5343 DEFVAR_LISP_NOPRO ("default-scroll-bar-width",
17af4bfeb062 (init_buffer_once): Set buffer_defaults and
Kim F. Storm <storm@cua.dk>
parents: 51166
diff changeset
5344 &buffer_defaults.scroll_bar_width,
17af4bfeb062 (init_buffer_once): Set buffer_defaults and
Kim F. Storm <storm@cua.dk>
parents: 51166
diff changeset
5345 doc: /* Default value of `scroll-bar-width' for buffers that don't override it.
17af4bfeb062 (init_buffer_once): Set buffer_defaults and
Kim F. Storm <storm@cua.dk>
parents: 51166
diff changeset
5346 This is the same as (default-value 'scroll-bar-width). */);
17af4bfeb062 (init_buffer_once): Set buffer_defaults and
Kim F. Storm <storm@cua.dk>
parents: 51166
diff changeset
5347
17af4bfeb062 (init_buffer_once): Set buffer_defaults and
Kim F. Storm <storm@cua.dk>
parents: 51166
diff changeset
5348 DEFVAR_LISP_NOPRO ("default-vertical-scroll-bar",
17af4bfeb062 (init_buffer_once): Set buffer_defaults and
Kim F. Storm <storm@cua.dk>
parents: 51166
diff changeset
5349 &buffer_defaults.vertical_scroll_bar_type,
17af4bfeb062 (init_buffer_once): Set buffer_defaults and
Kim F. Storm <storm@cua.dk>
parents: 51166
diff changeset
5350 doc: /* Default value of `vertical-scroll-bar' for buffers that don't override it.
17af4bfeb062 (init_buffer_once): Set buffer_defaults and
Kim F. Storm <storm@cua.dk>
parents: 51166
diff changeset
5351 This is the same as (default-value 'vertical-scroll-bar). */);
17af4bfeb062 (init_buffer_once): Set buffer_defaults and
Kim F. Storm <storm@cua.dk>
parents: 51166
diff changeset
5352
25021
7a31786a0335 (init_buffer_once): Init top_line_format.
Gerd Moellmann <gerd@gnu.org>
parents: 24975
diff changeset
5353 DEFVAR_LISP_NOPRO ("default-indicate-empty-lines",
40108
6084dfa5f85d Reindent DEFUNs and DEFVARs woth doc: keywords.
Pavel Janík <Pavel@Janik.cz>
parents: 39988
diff changeset
5354 &buffer_defaults.indicate_empty_lines,
6084dfa5f85d Reindent DEFUNs and DEFVARs woth doc: keywords.
Pavel Janík <Pavel@Janik.cz>
parents: 39988
diff changeset
5355 doc: /* Default value of `indicate-empty-lines' for buffers that don't override it.
39971
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5356 This is the same as (default-value 'indicate-empty-lines). */);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49444
diff changeset
5357
53602
4c14b3c50a31 (init_buffer_once): Set buffer_defaults and
Kim F. Storm <storm@cua.dk>
parents: 53350
diff changeset
5358 DEFVAR_LISP_NOPRO ("default-indicate-buffer-boundaries",
4c14b3c50a31 (init_buffer_once): Set buffer_defaults and
Kim F. Storm <storm@cua.dk>
parents: 53350
diff changeset
5359 &buffer_defaults.indicate_buffer_boundaries,
4c14b3c50a31 (init_buffer_once): Set buffer_defaults and
Kim F. Storm <storm@cua.dk>
parents: 53350
diff changeset
5360 doc: /* Default value of `indicate-buffer-boundaries' for buffers that don't override it.
4c14b3c50a31 (init_buffer_once): Set buffer_defaults and
Kim F. Storm <storm@cua.dk>
parents: 53350
diff changeset
5361 This is the same as (default-value 'indicate-buffer-boundaries). */);
4c14b3c50a31 (init_buffer_once): Set buffer_defaults and
Kim F. Storm <storm@cua.dk>
parents: 53350
diff changeset
5362
25021
7a31786a0335 (init_buffer_once): Init top_line_format.
Gerd Moellmann <gerd@gnu.org>
parents: 24975
diff changeset
5363 DEFVAR_LISP_NOPRO ("default-scroll-up-aggressively",
40108
6084dfa5f85d Reindent DEFUNs and DEFVARs woth doc: keywords.
Pavel Janík <Pavel@Janik.cz>
parents: 39988
diff changeset
5364 &buffer_defaults.scroll_up_aggressively,
41027
54f6ee43146e (syms_of_buffer): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 40840
diff changeset
5365 doc: /* Default value of `scroll-up-aggressively'.
54f6ee43146e (syms_of_buffer): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 40840
diff changeset
5366 This value applies in buffers that don't have their own local values.
54f6ee43146e (syms_of_buffer): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 40840
diff changeset
5367 This variable is an alias for (default-value 'scroll-up-aggressively). */);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49444
diff changeset
5368
25021
7a31786a0335 (init_buffer_once): Init top_line_format.
Gerd Moellmann <gerd@gnu.org>
parents: 24975
diff changeset
5369 DEFVAR_LISP_NOPRO ("default-scroll-down-aggressively",
40108
6084dfa5f85d Reindent DEFUNs and DEFVARs woth doc: keywords.
Pavel Janík <Pavel@Janik.cz>
parents: 39988
diff changeset
5370 &buffer_defaults.scroll_down_aggressively,
41027
54f6ee43146e (syms_of_buffer): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 40840
diff changeset
5371 doc: /* Default value of `scroll-down-aggressively'.
54f6ee43146e (syms_of_buffer): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 40840
diff changeset
5372 This value applies in buffers that don't have their own local values.
54f6ee43146e (syms_of_buffer): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 40840
diff changeset
5373 This variable is an alias for (default-value 'scroll-down-aggressively). */);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49444
diff changeset
5374
25546
Gerd Moellmann <gerd@gnu.org>
parents: 25508
diff changeset
5375 DEFVAR_PER_BUFFER ("header-line-format",
39971
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5376 &current_buffer->header_line_format,
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39974
diff changeset
5377 Qnil,
41027
54f6ee43146e (syms_of_buffer): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 40840
diff changeset
5378 doc: /* Analogous to `mode-line-format', but controls the header line.
54f6ee43146e (syms_of_buffer): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 40840
diff changeset
5379 The header line appears, optionally, at the top of a window;
54f6ee43146e (syms_of_buffer): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 40840
diff changeset
5380 the mode line appears at the bottom. */);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49444
diff changeset
5381
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5382 DEFVAR_PER_BUFFER ("mode-line-format", &current_buffer->mode_line_format,
40108
6084dfa5f85d Reindent DEFUNs and DEFVARs woth doc: keywords.
Pavel Janík <Pavel@Janik.cz>
parents: 39988
diff changeset
5383 Qnil,
6084dfa5f85d Reindent DEFUNs and DEFVARs woth doc: keywords.
Pavel Janík <Pavel@Janik.cz>
parents: 39988
diff changeset
5384 doc: /* Template for displaying mode line for current buffer.
39971
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5385 Each buffer has its own value of this variable.
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5386 Value may be nil, a string, a symbol or a list or cons cell.
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5387 A value of nil means don't display a mode line.
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5388 For a symbol, its value is used (but it is ignored if t or nil).
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5389 A string appearing directly as the value of a symbol is processed verbatim
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5390 in that the %-constructs below are not recognized.
48305
55b6e3969474 (syms_of_buffer) <mode-line-format>: Document symbol
Kim F. Storm <storm@cua.dk>
parents: 48227
diff changeset
5391 Note that unless the symbol is marked as a `risky-local-variable', all
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49444
diff changeset
5392 properties in any strings, as well as all :eval and :propertize forms
48305
55b6e3969474 (syms_of_buffer) <mode-line-format>: Document symbol
Kim F. Storm <storm@cua.dk>
parents: 48227
diff changeset
5393 in the value of that symbol will be ignored.
39971
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5394 For a list of the form `(:eval FORM)', FORM is evaluated and the result
48355
77552fd065a0 (syms_of_buffer): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 48305
diff changeset
5395 is used as a mode line element. Be careful--FORM should not load any files,
77552fd065a0 (syms_of_buffer): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 48305
diff changeset
5396 because that can cause an infinite recursion.
48305
55b6e3969474 (syms_of_buffer) <mode-line-format>: Document symbol
Kim F. Storm <storm@cua.dk>
parents: 48227
diff changeset
5397 For a list of the form `(:propertize ELT PROPS...)', ELT is displayed
55b6e3969474 (syms_of_buffer) <mode-line-format>: Document symbol
Kim F. Storm <storm@cua.dk>
parents: 48227
diff changeset
5398 with the specified properties PROPS applied.
39971
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5399 For a list whose car is a symbol, the symbol's value is taken,
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5400 and if that is non-nil, the cadr of the list is processed recursively.
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5401 Otherwise, the caddr of the list (if there is one) is processed.
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5402 For a list whose car is a string or list, each element is processed
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5403 recursively and the results are effectively concatenated.
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5404 For a list whose car is an integer, the cdr of the list is processed
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5405 and padded (if the number is positive) or truncated (if negative)
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5406 to the width specified by that number.
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5407 A string is printed verbatim in the mode line except for %-constructs:
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5408 (%-constructs are allowed when the string is the entire mode-line-format
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5409 or when it is found in a cons-cell or a list)
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5410 %b -- print buffer name. %f -- print visited file name.
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5411 %F -- print frame name.
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5412 %* -- print %, * or hyphen. %+ -- print *, % or hyphen.
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5413 %& is like %*, but ignore read-only-ness.
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5414 % means buffer is read-only and * means it is modified.
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5415 For a modified read-only buffer, %* gives % and %+ gives *.
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5416 %s -- print process status. %l -- print the current line number.
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5417 %c -- print the current column number (this makes editing slower).
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5418 To make the column number update correctly in all cases,
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5419 `column-number-mode' must be non-nil.
52459
efa9d19d170e (syms_of_buffer): Document `%i' and `%I' constructs for
Lute Kamstra <lute@gnu.org>
parents: 52401
diff changeset
5420 %i -- print the size of the buffer.
efa9d19d170e (syms_of_buffer): Document `%i' and `%I' constructs for
Lute Kamstra <lute@gnu.org>
parents: 52401
diff changeset
5421 %I -- like %i, but use k, M, G, etc., to abbreviate.
39971
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5422 %p -- print percent of buffer above top of window, or Top, Bot or All.
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5423 %P -- print percent of buffer above bottom of window, perhaps plus Top,
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5424 or print Bottom or All.
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5425 %m -- print the mode name.
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5426 %n -- print Narrow if appropriate.
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5427 %z -- print mnemonics of buffer, terminal, and keyboard coding systems.
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5428 %Z -- like %z, but including the end-of-line format.
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5429 %[ -- print one [ for each recursive editing level. %] similar.
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5430 %% -- print %. %- -- print infinitely many dashes.
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5431 Decimal digits after the % specify field width to which to pad. */);
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5432
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39974
diff changeset
5433 DEFVAR_LISP_NOPRO ("default-major-mode", &buffer_defaults.major_mode,
40108
6084dfa5f85d Reindent DEFUNs and DEFVARs woth doc: keywords.
Pavel Janík <Pavel@Janik.cz>
parents: 39988
diff changeset
5434 doc: /* *Major mode for new buffers. Defaults to `fundamental-mode'.
57138
5358b2582e78 (syms_of_buffer) <default-major-mode>: Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 56976
diff changeset
5435 nil here means use current buffer's major mode, provided it is not
5358b2582e78 (syms_of_buffer) <default-major-mode>: Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 56976
diff changeset
5436 marked as "special".
5358b2582e78 (syms_of_buffer) <default-major-mode>: Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 56976
diff changeset
5437
5358b2582e78 (syms_of_buffer) <default-major-mode>: Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 56976
diff changeset
5438 When a mode is used by default, `find-file' switches to it
5358b2582e78 (syms_of_buffer) <default-major-mode>: Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 56976
diff changeset
5439 before it reads the contents into the buffer and before
5358b2582e78 (syms_of_buffer) <default-major-mode>: Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 56976
diff changeset
5440 it finishes setting up the buffer. Thus, the mode and
5358b2582e78 (syms_of_buffer) <default-major-mode>: Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 56976
diff changeset
5441 its hooks should not expect certain variables such as
5358b2582e78 (syms_of_buffer) <default-major-mode>: Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 56976
diff changeset
5442 `buffer-read-only' and `buffer-file-coding-system' to be set up. */);
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5443
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5444 DEFVAR_PER_BUFFER ("major-mode", &current_buffer->major_mode,
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39974
diff changeset
5445 make_number (Lisp_Symbol),
40108
6084dfa5f85d Reindent DEFUNs and DEFVARs woth doc: keywords.
Pavel Janík <Pavel@Janik.cz>
parents: 39988
diff changeset
5446 doc: /* Symbol for current buffer's major mode. */);
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5447
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5448 DEFVAR_PER_BUFFER ("mode-name", &current_buffer->mode_name,
43712
223f1f5d160d (syms_of_buffer): Allow non-string `mode-name'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 43630
diff changeset
5449 Qnil,
40108
6084dfa5f85d Reindent DEFUNs and DEFVARs woth doc: keywords.
Pavel Janík <Pavel@Janik.cz>
parents: 39988
diff changeset
5450 doc: /* Pretty name of current buffer's major mode (a string). */);
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39974
diff changeset
5451
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39974
diff changeset
5452 DEFVAR_PER_BUFFER ("abbrev-mode", &current_buffer->abbrev_mode, Qnil,
40108
6084dfa5f85d Reindent DEFUNs and DEFVARs woth doc: keywords.
Pavel Janík <Pavel@Janik.cz>
parents: 39988
diff changeset
5453 doc: /* Non-nil turns on automatic expansion of abbrevs as they are inserted. */);
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5454
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5455 DEFVAR_PER_BUFFER ("case-fold-search", &current_buffer->case_fold_search,
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39974
diff changeset
5456 Qnil,
40108
6084dfa5f85d Reindent DEFUNs and DEFVARs woth doc: keywords.
Pavel Janík <Pavel@Janik.cz>
parents: 39988
diff changeset
5457 doc: /* *Non-nil if searches and matches should ignore case. */);
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5458
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5459 DEFVAR_PER_BUFFER ("fill-column", &current_buffer->fill_column,
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39974
diff changeset
5460 make_number (Lisp_Int),
46864
df9f70dd69a4 (syms_of_buffer) <fill-column>: Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 46599
diff changeset
5461 doc: /* *Column beyond which automatic line-wrapping should happen.
56138
5dde0034a30e (syms_of_buffer): Clarify `fill-column' docstring.
Luc Teirlinck <teirllm@auburn.edu>
parents: 55744
diff changeset
5462 Interactively, you can set the buffer local value using \\[set-fill-column]. */);
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5463
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5464 DEFVAR_PER_BUFFER ("left-margin", &current_buffer->left_margin,
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39974
diff changeset
5465 make_number (Lisp_Int),
40108
6084dfa5f85d Reindent DEFUNs and DEFVARs woth doc: keywords.
Pavel Janík <Pavel@Janik.cz>
parents: 39988
diff changeset
5466 doc: /* *Column for the default indent-line-function to indent to.
39971
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5467 Linefeed indents to this column in Fundamental mode. */);
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5468
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5469 DEFVAR_PER_BUFFER ("tab-width", &current_buffer->tab_width,
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39974
diff changeset
5470 make_number (Lisp_Int),
40108
6084dfa5f85d Reindent DEFUNs and DEFVARs woth doc: keywords.
Pavel Janík <Pavel@Janik.cz>
parents: 39988
diff changeset
5471 doc: /* *Distance between tab stops (for display of tab characters), in columns. */);
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39974
diff changeset
5472
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39974
diff changeset
5473 DEFVAR_PER_BUFFER ("ctl-arrow", &current_buffer->ctl_arrow, Qnil,
40108
6084dfa5f85d Reindent DEFUNs and DEFVARs woth doc: keywords.
Pavel Janík <Pavel@Janik.cz>
parents: 39988
diff changeset
5474 doc: /* *Non-nil means display control chars with uparrow.
39971
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5475 A value of nil means use backslash and octal digits.
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5476 This variable does not apply to characters whose display is specified
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5477 in the current display table (if there is one). */);
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5478
17022
907fb167f7de Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16840
diff changeset
5479 DEFVAR_PER_BUFFER ("enable-multibyte-characters",
20995
abc60038dd2b (syms_of_buffer): enable-multibyte-characters is read-only.
Karl Heuer <kwzh@gnu.org>
parents: 20935
diff changeset
5480 &current_buffer->enable_multibyte_characters,
50304
d9d826db650f (overlays_in): Declare static.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50014
diff changeset
5481 Qnil,
40108
6084dfa5f85d Reindent DEFUNs and DEFVARs woth doc: keywords.
Pavel Janík <Pavel@Janik.cz>
parents: 39988
diff changeset
5482 doc: /* Non-nil means the buffer contents are regarded as multi-byte characters.
39971
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5483 Otherwise they are regarded as unibyte. This affects the display,
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5484 file I/O and the behavior of various editing commands.
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5485
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5486 This variable is buffer-local but you cannot set it directly;
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5487 use the function `set-buffer-multibyte' to change a buffer's representation.
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5488 Changing its default value with `setq-default' is supported.
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5489 See also variable `default-enable-multibyte-characters' and Info node
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5490 `(elisp)Text Representations'. */);
50304
d9d826db650f (overlays_in): Declare static.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50014
diff changeset
5491 XSYMBOL (intern ("enable-multibyte-characters"))->constant = 1;
17022
907fb167f7de Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16840
diff changeset
5492
18178
b45b431879bf (init_buffer_once): Inititialize the member
Kenichi Handa <handa@m17n.org>
parents: 18105
diff changeset
5493 DEFVAR_PER_BUFFER ("buffer-file-coding-system",
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39974
diff changeset
5494 &current_buffer->buffer_file_coding_system, Qnil,
40108
6084dfa5f85d Reindent DEFUNs and DEFVARs woth doc: keywords.
Pavel Janík <Pavel@Janik.cz>
parents: 39988
diff changeset
5495 doc: /* Coding system to be used for encoding the buffer contents on saving.
39971
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5496 This variable applies to saving the buffer, and also to `write-region'
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5497 and other functions that use `write-region'.
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5498 It does not apply to sending output to subprocesses, however.
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5499
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5500 If this is nil, the buffer is saved without any code conversion
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5501 unless some coding system is specified in `file-coding-system-alist'
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5502 for the buffer file.
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5503
43630
a4789f07d85d (syms_of_buffer) <buffer-file-coding-system>: Doc fix.
Eli Zaretskii <eliz@gnu.org>
parents: 42982
diff changeset
5504 If the text to be saved cannot be encoded as specified by this variable,
a4789f07d85d (syms_of_buffer) <buffer-file-coding-system>: Doc fix.
Eli Zaretskii <eliz@gnu.org>
parents: 42982
diff changeset
5505 an alternative encoding is selected by `select-safe-coding-system', which see.
a4789f07d85d (syms_of_buffer) <buffer-file-coding-system>: Doc fix.
Eli Zaretskii <eliz@gnu.org>
parents: 42982
diff changeset
5506
39971
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5507 The variable `coding-system-for-write', if non-nil, overrides this variable.
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5508
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5509 This variable is never applied to a way of decoding a file while reading it. */);
18178
b45b431879bf (init_buffer_once): Inititialize the member
Kenichi Handa <handa@m17n.org>
parents: 18105
diff changeset
5510
17022
907fb167f7de Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16840
diff changeset
5511 DEFVAR_PER_BUFFER ("direction-reversed", &current_buffer->direction_reversed,
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39974
diff changeset
5512 Qnil,
40108
6084dfa5f85d Reindent DEFUNs and DEFVARs woth doc: keywords.
Pavel Janík <Pavel@Janik.cz>
parents: 39988
diff changeset
5513 doc: /* *Non-nil means lines in the buffer are displayed right to left. */);
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39974
diff changeset
5514
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39974
diff changeset
5515 DEFVAR_PER_BUFFER ("truncate-lines", &current_buffer->truncate_lines, Qnil,
41027
54f6ee43146e (syms_of_buffer): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 40840
diff changeset
5516 doc: /* *Non-nil means do not display continuation lines.
54f6ee43146e (syms_of_buffer): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 40840
diff changeset
5517 Instead, give each line of text just one screen line.
39971
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5518
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5519 Note that this is overridden by the variable
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5520 `truncate-partial-width-windows' if that variable is non-nil
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5521 and this buffer is not full-frame width. */);
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5522
9785
a72386110d83 (init_buffer): Use DIRECTORY_SEP, IS_DIRECTORY_SEP macros,
Richard M. Stallman <rms@gnu.org>
parents: 9732
diff changeset
5523 #ifdef DOS_NT
5502
2b48fd9bc80e [MSDOS]: New buffer-local variable:
Richard M. Stallman <rms@gnu.org>
parents: 5433
diff changeset
5524 DEFVAR_PER_BUFFER ("buffer-file-type", &current_buffer->buffer_file_type,
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39974
diff changeset
5525 Qnil,
40108
6084dfa5f85d Reindent DEFUNs and DEFVARs woth doc: keywords.
Pavel Janík <Pavel@Janik.cz>
parents: 39988
diff changeset
5526 doc: /* Non-nil if the visited file is a binary file.
39971
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5527 This variable is meaningful on MS-DOG and Windows NT.
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5528 On those systems, it is automatically local in every buffer.
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5529 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
5530 #endif
2b48fd9bc80e [MSDOS]: New buffer-local variable:
Richard M. Stallman <rms@gnu.org>
parents: 5433
diff changeset
5531
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5532 DEFVAR_PER_BUFFER ("default-directory", &current_buffer->directory,
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39974
diff changeset
5533 make_number (Lisp_String),
40108
6084dfa5f85d Reindent DEFUNs and DEFVARs woth doc: keywords.
Pavel Janík <Pavel@Janik.cz>
parents: 39988
diff changeset
5534 doc: /* Name of default directory of current buffer. Should end with slash.
39971
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5535 To interactively change the default directory, use command `cd'. */);
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5536
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5537 DEFVAR_PER_BUFFER ("auto-fill-function", &current_buffer->auto_fill_function,
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39974
diff changeset
5538 Qnil,
40108
6084dfa5f85d Reindent DEFUNs and DEFVARs woth doc: keywords.
Pavel Janík <Pavel@Janik.cz>
parents: 39988
diff changeset
5539 doc: /* Function called (if non-nil) to perform auto-fill.
39971
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5540 It is called after self-inserting any character specified in
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5541 the `auto-fill-chars' table.
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5542 NOTE: This variable is not a hook;
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5543 its value may not be a list of functions. */);
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5544
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5545 DEFVAR_PER_BUFFER ("buffer-file-name", &current_buffer->filename,
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39974
diff changeset
5546 make_number (Lisp_String),
40108
6084dfa5f85d Reindent DEFUNs and DEFVARs woth doc: keywords.
Pavel Janík <Pavel@Janik.cz>
parents: 39988
diff changeset
5547 doc: /* Name of file visited in current buffer, or nil if not visiting a file. */);
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5548
10751
dea8f022819d (syms_of_buffer): Set up Lisp var buffer-file-truename.
Richard M. Stallman <rms@gnu.org>
parents: 10668
diff changeset
5549 DEFVAR_PER_BUFFER ("buffer-file-truename", &current_buffer->file_truename,
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39974
diff changeset
5550 make_number (Lisp_String),
40108
6084dfa5f85d Reindent DEFUNs and DEFVARs woth doc: keywords.
Pavel Janík <Pavel@Janik.cz>
parents: 39988
diff changeset
5551 doc: /* Abbreviated truename of file visited in current buffer, or nil if none.
39971
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5552 The truename of a file is calculated by `file-truename'
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5553 and then abbreviated with `abbreviate-file-name'. */);
10751
dea8f022819d (syms_of_buffer): Set up Lisp var buffer-file-truename.
Richard M. Stallman <rms@gnu.org>
parents: 10668
diff changeset
5554
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5555 DEFVAR_PER_BUFFER ("buffer-auto-save-file-name",
1041
da04b25b1759 Formatting change
Jim Blandy <jimb@redhat.com>
parents: 1038
diff changeset
5556 &current_buffer->auto_save_file_name,
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39974
diff changeset
5557 make_number (Lisp_String),
41027
54f6ee43146e (syms_of_buffer): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 40840
diff changeset
5558 doc: /* Name of file for auto-saving current buffer.
54f6ee43146e (syms_of_buffer): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 40840
diff changeset
5559 If it is nil, that means don't auto-save this buffer. */);
39971
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5560
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39974
diff changeset
5561 DEFVAR_PER_BUFFER ("buffer-read-only", &current_buffer->read_only, Qnil,
40108
6084dfa5f85d Reindent DEFUNs and DEFVARs woth doc: keywords.
Pavel Janík <Pavel@Janik.cz>
parents: 39988
diff changeset
5562 doc: /* Non-nil if this buffer is read-only. */);
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39974
diff changeset
5563
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39974
diff changeset
5564 DEFVAR_PER_BUFFER ("buffer-backed-up", &current_buffer->backed_up, Qnil,
40108
6084dfa5f85d Reindent DEFUNs and DEFVARs woth doc: keywords.
Pavel Janík <Pavel@Janik.cz>
parents: 39988
diff changeset
5565 doc: /* Non-nil if this buffer's file has been backed up.
39971
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5566 Backing up is done before the first time the file is saved. */);
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5567
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5568 DEFVAR_PER_BUFFER ("buffer-saved-size", &current_buffer->save_length,
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39974
diff changeset
5569 make_number (Lisp_Int),
40108
6084dfa5f85d Reindent DEFUNs and DEFVARs woth doc: keywords.
Pavel Janík <Pavel@Janik.cz>
parents: 39988
diff changeset
5570 doc: /* Length of current buffer when last read in, saved or auto-saved.
39971
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5571 0 initially. */);
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5572
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5573 DEFVAR_PER_BUFFER ("selective-display", &current_buffer->selective_display,
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39974
diff changeset
5574 Qnil,
41027
54f6ee43146e (syms_of_buffer): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 40840
diff changeset
5575 doc: /* Non-nil enables selective display.
54f6ee43146e (syms_of_buffer): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 40840
diff changeset
5576 An Integer N as value means display only lines
54f6ee43146e (syms_of_buffer): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 40840
diff changeset
5577 that start with less than n columns of space.
54f6ee43146e (syms_of_buffer): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 40840
diff changeset
5578 A value of t means that the character ^M makes itself and
54f6ee43146e (syms_of_buffer): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 40840
diff changeset
5579 all the rest of the line invisible; also, when saving the buffer
54f6ee43146e (syms_of_buffer): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 40840
diff changeset
5580 in a file, save the ^M as a newline. */);
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5581
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5582 #ifndef old
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5583 DEFVAR_PER_BUFFER ("selective-display-ellipses",
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5584 &current_buffer->selective_display_ellipses,
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39974
diff changeset
5585 Qnil,
40567
7c28809db274 (selective-display-ellipses): Doc fix.
Pavel Janík <Pavel@Janik.cz>
parents: 40108
diff changeset
5586 doc: /* Non-nil means display ... on previous line when a line is invisible. */);
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5587 #endif
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5588
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39974
diff changeset
5589 DEFVAR_PER_BUFFER ("overwrite-mode", &current_buffer->overwrite_mode, Qnil,
40108
6084dfa5f85d Reindent DEFUNs and DEFVARs woth doc: keywords.
Pavel Janík <Pavel@Janik.cz>
parents: 39988
diff changeset
5590 doc: /* Non-nil if self-insertion should replace existing text.
39971
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5591 The value should be one of `overwrite-mode-textual',
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5592 `overwrite-mode-binary', or nil.
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5593 If it is `overwrite-mode-textual', self-insertion still
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5594 inserts at the end of a line, and inserts when point is before a tab,
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5595 until the tab is filled in.
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5596 If `overwrite-mode-binary', self-insertion replaces newlines and tabs too. */);
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5597
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5598 DEFVAR_PER_BUFFER ("buffer-display-table", &current_buffer->display_table,
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39974
diff changeset
5599 Qnil,
40108
6084dfa5f85d Reindent DEFUNs and DEFVARs woth doc: keywords.
Pavel Janík <Pavel@Janik.cz>
parents: 39988
diff changeset
5600 doc: /* Display table that controls display of the contents of current buffer.
39971
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5601
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5602 If this variable is nil, the value of `standard-display-table' is used.
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5603 Each window can have its own, overriding display table, see
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5604 `set-window-display-table' and `window-display-table'.
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5605
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5606 The display table is a char-table created with `make-display-table'.
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5607 A char-table is an array indexed by character codes. Normal array
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5608 primitives `aref' and `aset' can be used to access elements of a char-table.
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5609
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5610 Each of the char-table elements control how to display the corresponding
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5611 text character: the element at index C in the table says how to display
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5612 the character whose code is C. Each element should be a vector of
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5613 characters or nil. nil means display the character in the default fashion;
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5614 otherwise, the characters from the vector are delivered to the screen
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5615 instead of the original character.
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5616
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5617 For example, (aset buffer-display-table ?X ?Y) will cause Emacs to display
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5618 a capital Y instead of each X character.
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5619
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5620 In addition, a char-table has six extra slots to control the display of:
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5621
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5622 the end of a truncated screen line (extra-slot 0, a single character);
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5623 the end of a continued line (extra-slot 1, a single character);
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5624 the escape character used to display character codes in octal
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5625 (extra-slot 2, a single character);
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5626 the character used as an arrow for control characters (extra-slot 3,
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5627 a single character);
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5628 the decoration indicating the presence of invisible lines (extra-slot 4,
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5629 a vector of characters);
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5630 the character used to draw the border between side-by-side windows
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5631 (extra-slot 5, a single character).
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5632
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5633 See also the functions `display-table-slot' and `set-display-table-slot'. */);
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5634
51190
17af4bfeb062 (init_buffer_once): Set buffer_defaults and
Kim F. Storm <storm@cua.dk>
parents: 51166
diff changeset
5635 DEFVAR_PER_BUFFER ("left-margin-width", &current_buffer->left_margin_cols,
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39974
diff changeset
5636 Qnil,
40108
6084dfa5f85d Reindent DEFUNs and DEFVARs woth doc: keywords.
Pavel Janík <Pavel@Janik.cz>
parents: 39988
diff changeset
5637 doc: /* *Width of left marginal area for display of a buffer.
39971
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5638 A value of nil means no marginal area. */);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49444
diff changeset
5639
51190
17af4bfeb062 (init_buffer_once): Set buffer_defaults and
Kim F. Storm <storm@cua.dk>
parents: 51166
diff changeset
5640 DEFVAR_PER_BUFFER ("right-margin-width", &current_buffer->right_margin_cols,
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39974
diff changeset
5641 Qnil,
40108
6084dfa5f85d Reindent DEFUNs and DEFVARs woth doc: keywords.
Pavel Janík <Pavel@Janik.cz>
parents: 39988
diff changeset
5642 doc: /* *Width of right marginal area for display of a buffer.
39971
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5643 A value of nil means no marginal area. */);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49444
diff changeset
5644
51190
17af4bfeb062 (init_buffer_once): Set buffer_defaults and
Kim F. Storm <storm@cua.dk>
parents: 51166
diff changeset
5645 DEFVAR_PER_BUFFER ("left-fringe-width", &current_buffer->left_fringe_width,
17af4bfeb062 (init_buffer_once): Set buffer_defaults and
Kim F. Storm <storm@cua.dk>
parents: 51166
diff changeset
5646 Qnil,
17af4bfeb062 (init_buffer_once): Set buffer_defaults and
Kim F. Storm <storm@cua.dk>
parents: 51166
diff changeset
5647 doc: /* *Width of this buffer's left fringe (in pixels).
17af4bfeb062 (init_buffer_once): Set buffer_defaults and
Kim F. Storm <storm@cua.dk>
parents: 51166
diff changeset
5648 A value of 0 means no left fringe is shown in this buffer's window.
17af4bfeb062 (init_buffer_once): Set buffer_defaults and
Kim F. Storm <storm@cua.dk>
parents: 51166
diff changeset
5649 A value of nil means to use the left fringe width from the window's frame. */);
17af4bfeb062 (init_buffer_once): Set buffer_defaults and
Kim F. Storm <storm@cua.dk>
parents: 51166
diff changeset
5650
17af4bfeb062 (init_buffer_once): Set buffer_defaults and
Kim F. Storm <storm@cua.dk>
parents: 51166
diff changeset
5651 DEFVAR_PER_BUFFER ("right-fringe-width", &current_buffer->right_fringe_width,
17af4bfeb062 (init_buffer_once): Set buffer_defaults and
Kim F. Storm <storm@cua.dk>
parents: 51166
diff changeset
5652 Qnil,
17af4bfeb062 (init_buffer_once): Set buffer_defaults and
Kim F. Storm <storm@cua.dk>
parents: 51166
diff changeset
5653 doc: /* *Width of this buffer's right fringe (in pixels).
17af4bfeb062 (init_buffer_once): Set buffer_defaults and
Kim F. Storm <storm@cua.dk>
parents: 51166
diff changeset
5654 A value of 0 means no right fringe is shown in this buffer's window.
17af4bfeb062 (init_buffer_once): Set buffer_defaults and
Kim F. Storm <storm@cua.dk>
parents: 51166
diff changeset
5655 A value of nil means to use the right fringe width from the window's frame. */);
17af4bfeb062 (init_buffer_once): Set buffer_defaults and
Kim F. Storm <storm@cua.dk>
parents: 51166
diff changeset
5656
17af4bfeb062 (init_buffer_once): Set buffer_defaults and
Kim F. Storm <storm@cua.dk>
parents: 51166
diff changeset
5657 DEFVAR_PER_BUFFER ("fringes-outside-margins", &current_buffer->fringes_outside_margins,
17af4bfeb062 (init_buffer_once): Set buffer_defaults and
Kim F. Storm <storm@cua.dk>
parents: 51166
diff changeset
5658 Qnil,
17af4bfeb062 (init_buffer_once): Set buffer_defaults and
Kim F. Storm <storm@cua.dk>
parents: 51166
diff changeset
5659 doc: /* *Non-nil means to display fringes outside display margins.
17af4bfeb062 (init_buffer_once): Set buffer_defaults and
Kim F. Storm <storm@cua.dk>
parents: 51166
diff changeset
5660 A value of nil means to display fringes between margins and buffer text. */);
17af4bfeb062 (init_buffer_once): Set buffer_defaults and
Kim F. Storm <storm@cua.dk>
parents: 51166
diff changeset
5661
17af4bfeb062 (init_buffer_once): Set buffer_defaults and
Kim F. Storm <storm@cua.dk>
parents: 51166
diff changeset
5662 DEFVAR_PER_BUFFER ("scroll-bar-width", &current_buffer->scroll_bar_width,
17af4bfeb062 (init_buffer_once): Set buffer_defaults and
Kim F. Storm <storm@cua.dk>
parents: 51166
diff changeset
5663 Qnil,
17af4bfeb062 (init_buffer_once): Set buffer_defaults and
Kim F. Storm <storm@cua.dk>
parents: 51166
diff changeset
5664 doc: /* *Width of this buffer's scroll bars in pixels.
17af4bfeb062 (init_buffer_once): Set buffer_defaults and
Kim F. Storm <storm@cua.dk>
parents: 51166
diff changeset
5665 A value of nil means to use the scroll bar width from the window's frame. */);
17af4bfeb062 (init_buffer_once): Set buffer_defaults and
Kim F. Storm <storm@cua.dk>
parents: 51166
diff changeset
5666
17af4bfeb062 (init_buffer_once): Set buffer_defaults and
Kim F. Storm <storm@cua.dk>
parents: 51166
diff changeset
5667 DEFVAR_PER_BUFFER ("vertical-scroll-bar", &current_buffer->vertical_scroll_bar_type,
17af4bfeb062 (init_buffer_once): Set buffer_defaults and
Kim F. Storm <storm@cua.dk>
parents: 51166
diff changeset
5668 Qnil,
17af4bfeb062 (init_buffer_once): Set buffer_defaults and
Kim F. Storm <storm@cua.dk>
parents: 51166
diff changeset
5669 doc: /* *Position of this buffer's vertical scroll bar.
59191
f6d6e52c03a4 (syms_of_buffer) <vertical-scroll-bar>: Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 59114
diff changeset
5670 The value takes effect whenever you tell a window to display this buffer;
59194
e81022709627 (syms_of_buffer) <vertical-scroll-bar>: Correct typo.
Luc Teirlinck <teirllm@auburn.edu>
parents: 59191
diff changeset
5671 for instance, with `set-window-buffer' or when `display-buffer' displays it.
59191
f6d6e52c03a4 (syms_of_buffer) <vertical-scroll-bar>: Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 59114
diff changeset
5672
59114
3f2406abbe2a (Fbuffer_disable_undo): Deleted (moved to simple.el).
Richard M. Stallman <rms@gnu.org>
parents: 58618
diff changeset
5673 A value of `left' or `right' means put the vertical scroll bar at that side
3f2406abbe2a (Fbuffer_disable_undo): Deleted (moved to simple.el).
Richard M. Stallman <rms@gnu.org>
parents: 58618
diff changeset
5674 of the window; a value of nil means don't show any vertical scroll bars.
3f2406abbe2a (Fbuffer_disable_undo): Deleted (moved to simple.el).
Richard M. Stallman <rms@gnu.org>
parents: 58618
diff changeset
5675 A value of t (the default) means do whatever the window's frame specifies. */);
51190
17af4bfeb062 (init_buffer_once): Set buffer_defaults and
Kim F. Storm <storm@cua.dk>
parents: 51166
diff changeset
5676
25021
7a31786a0335 (init_buffer_once): Init top_line_format.
Gerd Moellmann <gerd@gnu.org>
parents: 24975
diff changeset
5677 DEFVAR_PER_BUFFER ("indicate-empty-lines",
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39974
diff changeset
5678 &current_buffer->indicate_empty_lines, Qnil,
40108
6084dfa5f85d Reindent DEFUNs and DEFVARs woth doc: keywords.
Pavel Janík <Pavel@Janik.cz>
parents: 39988
diff changeset
5679 doc: /* *Visually indicate empty lines after the buffer end.
39971
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5680 If non-nil, a bitmap is displayed in the left fringe of a window on
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5681 window-systems. */);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49444
diff changeset
5682
53602
4c14b3c50a31 (init_buffer_once): Set buffer_defaults and
Kim F. Storm <storm@cua.dk>
parents: 53350
diff changeset
5683 DEFVAR_PER_BUFFER ("indicate-buffer-boundaries",
4c14b3c50a31 (init_buffer_once): Set buffer_defaults and
Kim F. Storm <storm@cua.dk>
parents: 53350
diff changeset
5684 &current_buffer->indicate_buffer_boundaries, Qnil,
4c14b3c50a31 (init_buffer_once): Set buffer_defaults and
Kim F. Storm <storm@cua.dk>
parents: 53350
diff changeset
5685 doc: /* *Visually indicate buffer boundaries and scrolling.
53958
1aa8132576ec (syms_of_buffer): Doc fix for indicate-buffer-boundaries.
Kim F. Storm <storm@cua.dk>
parents: 53816
diff changeset
5686 If non-nil, the first and last line of the buffer are marked in the fringe
1aa8132576ec (syms_of_buffer): Doc fix for indicate-buffer-boundaries.
Kim F. Storm <storm@cua.dk>
parents: 53816
diff changeset
5687 of a window on window-systems with angle bitmaps, or if the window can be
1aa8132576ec (syms_of_buffer): Doc fix for indicate-buffer-boundaries.
Kim F. Storm <storm@cua.dk>
parents: 53816
diff changeset
5688 scrolled, the top and bottom line of the window are marked with up and down
1aa8132576ec (syms_of_buffer): Doc fix for indicate-buffer-boundaries.
Kim F. Storm <storm@cua.dk>
parents: 53816
diff changeset
5689 arrow bitmaps.
57245
8c66fdb3c3ba (syms_of_buffer) <indicate-buffer-boundaries>:
Kim F. Storm <storm@cua.dk>
parents: 57138
diff changeset
5690
8c66fdb3c3ba (syms_of_buffer) <indicate-buffer-boundaries>:
Kim F. Storm <storm@cua.dk>
parents: 57138
diff changeset
5691 If value is a symbol `left' or `right', both angle and arrow bitmaps
58501
8f225aca7c72 (syms_of_buffer) <indicate-buffer-boundaries>: Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 57705
diff changeset
5692 are displayed in the left or right fringe, resp. Any other value
60248
8b2c028d58cb (syms_of_buffer): Fix typo.
Lute Kamstra <lute@gnu.org>
parents: 60217
diff changeset
5693 that doesn't look like an alist means display the angle bitmaps in
58501
8f225aca7c72 (syms_of_buffer) <indicate-buffer-boundaries>: Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 57705
diff changeset
5694 the left fringe but no arrows.
8f225aca7c72 (syms_of_buffer) <indicate-buffer-boundaries>: Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 57705
diff changeset
5695
8f225aca7c72 (syms_of_buffer) <indicate-buffer-boundaries>: Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 57705
diff changeset
5696 You can exercise more precise control by using an alist as the
8f225aca7c72 (syms_of_buffer) <indicate-buffer-boundaries>: Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 57705
diff changeset
5697 value. Each alist element (INDICATOR . POSITION) specifies
8f225aca7c72 (syms_of_buffer) <indicate-buffer-boundaries>: Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 57705
diff changeset
5698 where to show one of the indicators. INDICATOR is one of `top',
57245
8c66fdb3c3ba (syms_of_buffer) <indicate-buffer-boundaries>:
Kim F. Storm <storm@cua.dk>
parents: 57138
diff changeset
5699 `bottom', `up', `down', or t, which specifies the default position,
8c66fdb3c3ba (syms_of_buffer) <indicate-buffer-boundaries>:
Kim F. Storm <storm@cua.dk>
parents: 57138
diff changeset
5700 and POSITION is one of `left', `right', or nil, meaning do not show
8c66fdb3c3ba (syms_of_buffer) <indicate-buffer-boundaries>:
Kim F. Storm <storm@cua.dk>
parents: 57138
diff changeset
5701 this indicator.
8c66fdb3c3ba (syms_of_buffer) <indicate-buffer-boundaries>:
Kim F. Storm <storm@cua.dk>
parents: 57138
diff changeset
5702
8c66fdb3c3ba (syms_of_buffer) <indicate-buffer-boundaries>:
Kim F. Storm <storm@cua.dk>
parents: 57138
diff changeset
5703 For example, ((top . left) (t . right)) places the top angle bitmap in
8c66fdb3c3ba (syms_of_buffer) <indicate-buffer-boundaries>:
Kim F. Storm <storm@cua.dk>
parents: 57138
diff changeset
5704 left fringe, the bottom angle bitmap in right fringe, and both arrow
53958
1aa8132576ec (syms_of_buffer): Doc fix for indicate-buffer-boundaries.
Kim F. Storm <storm@cua.dk>
parents: 53816
diff changeset
5705 bitmaps in right fringe. To show just the angle bitmaps in the left
57245
8c66fdb3c3ba (syms_of_buffer) <indicate-buffer-boundaries>:
Kim F. Storm <storm@cua.dk>
parents: 57138
diff changeset
5706 fringe, but no arrow bitmaps, use ((top . left) (bottom . left)). */);
53602
4c14b3c50a31 (init_buffer_once): Set buffer_defaults and
Kim F. Storm <storm@cua.dk>
parents: 53350
diff changeset
5707
25021
7a31786a0335 (init_buffer_once): Init top_line_format.
Gerd Moellmann <gerd@gnu.org>
parents: 24975
diff changeset
5708 DEFVAR_PER_BUFFER ("scroll-up-aggressively",
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39974
diff changeset
5709 &current_buffer->scroll_up_aggressively, Qnil,
49057
8c97b527621e (syms_of_buffer) <scroll-up-aggressively, scroll-down-aggressively>: Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 48947
diff changeset
5710 doc: /* How far to scroll windows upward.
8c97b527621e (syms_of_buffer) <scroll-up-aggressively, scroll-down-aggressively>: Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 48947
diff changeset
5711 If you move point off the bottom, the window scrolls automatically.
8c97b527621e (syms_of_buffer) <scroll-up-aggressively, scroll-down-aggressively>: Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 48947
diff changeset
5712 This variable controls how far it scrolls. nil, the default,
8c97b527621e (syms_of_buffer) <scroll-up-aggressively, scroll-down-aggressively>: Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 48947
diff changeset
5713 means scroll to center point. A fraction means scroll to put point
8c97b527621e (syms_of_buffer) <scroll-up-aggressively, scroll-down-aggressively>: Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 48947
diff changeset
5714 that fraction of the window's height from the bottom of the window.
8c97b527621e (syms_of_buffer) <scroll-up-aggressively, scroll-down-aggressively>: Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 48947
diff changeset
5715 When the value is 0.0, point goes at the bottom line, which in the simple
8c97b527621e (syms_of_buffer) <scroll-up-aggressively, scroll-down-aggressively>: Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 48947
diff changeset
5716 case that you moved off with C-f means scrolling just one line. 1.0 means
8c97b527621e (syms_of_buffer) <scroll-up-aggressively, scroll-down-aggressively>: Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 48947
diff changeset
5717 point goes at the top, so that in that simple case, the window
64469
c9c8b7be7119 (scroll-up-aggressively, scroll-down-aggressively): Delete duplicate words.
Juri Linkov <juri@jurta.org>
parents: 64412
diff changeset
5718 scrolls by a full window height. Meaningful values are
48947
3bdd36228f48 (syms_of_buffer) <scroll-up-aggressively, scroll-down-aggressively>: Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 48776
diff changeset
5719 between 0.0 and 1.0, inclusive. */);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49444
diff changeset
5720
25021
7a31786a0335 (init_buffer_once): Init top_line_format.
Gerd Moellmann <gerd@gnu.org>
parents: 24975
diff changeset
5721 DEFVAR_PER_BUFFER ("scroll-down-aggressively",
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39974
diff changeset
5722 &current_buffer->scroll_down_aggressively, Qnil,
49057
8c97b527621e (syms_of_buffer) <scroll-up-aggressively, scroll-down-aggressively>: Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 48947
diff changeset
5723 doc: /* How far to scroll windows downward.
8c97b527621e (syms_of_buffer) <scroll-up-aggressively, scroll-down-aggressively>: Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 48947
diff changeset
5724 If you move point off the top, the window scrolls automatically.
8c97b527621e (syms_of_buffer) <scroll-up-aggressively, scroll-down-aggressively>: Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 48947
diff changeset
5725 This variable controls how far it scrolls. nil, the default,
8c97b527621e (syms_of_buffer) <scroll-up-aggressively, scroll-down-aggressively>: Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 48947
diff changeset
5726 means scroll to center point. A fraction means scroll to put point
8c97b527621e (syms_of_buffer) <scroll-up-aggressively, scroll-down-aggressively>: Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 48947
diff changeset
5727 that fraction of the window's height from the top of the window.
8c97b527621e (syms_of_buffer) <scroll-up-aggressively, scroll-down-aggressively>: Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 48947
diff changeset
5728 When the value is 0.0, point goes at the top line, which in the simple
8c97b527621e (syms_of_buffer) <scroll-up-aggressively, scroll-down-aggressively>: Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 48947
diff changeset
5729 case that you moved off with C-b means scrolling just one line. 1.0 means
8c97b527621e (syms_of_buffer) <scroll-up-aggressively, scroll-down-aggressively>: Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 48947
diff changeset
5730 point goes at the bottom, so that in that simple case, the window
64469
c9c8b7be7119 (scroll-up-aggressively, scroll-down-aggressively): Delete duplicate words.
Juri Linkov <juri@jurta.org>
parents: 64412
diff changeset
5731 scrolls by a full window height. Meaningful values are
48947
3bdd36228f48 (syms_of_buffer) <scroll-up-aggressively, scroll-down-aggressively>: Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 48776
diff changeset
5732 between 0.0 and 1.0, inclusive. */);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49444
diff changeset
5733
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5734 /*DEFVAR_LISP ("debug-check-symbol", &Vcheck_symbol,
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5735 "Don't ask.");
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5736 */
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5737
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39974
diff changeset
5738 DEFVAR_LISP ("before-change-functions", &Vbefore_change_functions,
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39974
diff changeset
5739 doc: /* List of functions to call before each text change.
39971
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5740 Two arguments are passed to each function: the positions of
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5741 the beginning and end of the range of old text to be changed.
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5742 \(For an insertion, the beginning and end are at the same place.)
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5743 No information is given about the length of the text after the change.
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5744
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5745 Buffer changes made while executing the `before-change-functions'
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5746 don't call any before-change or after-change functions.
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5747 That's because these variables are temporarily set to nil.
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5748 As a result, a hook function cannot straightforwardly alter the value of
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5749 these variables. See the Emacs Lisp manual for a way of
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5750 accomplishing an equivalent result by using other variables.
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5751
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5752 If an unhandled error happens in running these functions,
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5753 the variable's value remains nil. That prevents the error
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5754 from happening repeatedly and making Emacs nonfunctional. */);
6785
121f2c5eba5e (Vafter_change_functions, Vbefore_change_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 6697
diff changeset
5755 Vbefore_change_functions = Qnil;
121f2c5eba5e (Vafter_change_functions, Vbefore_change_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 6697
diff changeset
5756
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39974
diff changeset
5757 DEFVAR_LISP ("after-change-functions", &Vafter_change_functions,
44790
56ce64222cbe (syms_of_buffer): Doc fix.
Colin Walters <walters@gnu.org>
parents: 44784
diff changeset
5758 doc: /* List of functions to call after each text change.
39971
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5759 Three arguments are passed to each function: the positions of
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5760 the beginning and end of the range of changed text,
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5761 and the length in bytes of the pre-change text replaced by that range.
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5762 \(For an insertion, the pre-change length is zero;
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5763 for a deletion, that length is the number of bytes deleted,
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5764 and the post-change beginning and end are at the same place.)
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5765
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5766 Buffer changes made while executing the `after-change-functions'
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5767 don't call any before-change or after-change functions.
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5768 That's because these variables are temporarily set to nil.
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5769 As a result, a hook function cannot straightforwardly alter the value of
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5770 these variables. See the Emacs Lisp manual for a way of
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5771 accomplishing an equivalent result by using other variables.
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5772
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5773 If an unhandled error happens in running these functions,
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5774 the variable's value remains nil. That prevents the error
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5775 from happening repeatedly and making Emacs nonfunctional. */);
6785
121f2c5eba5e (Vafter_change_functions, Vbefore_change_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 6697
diff changeset
5776 Vafter_change_functions = Qnil;
121f2c5eba5e (Vafter_change_functions, Vbefore_change_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 6697
diff changeset
5777
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39974
diff changeset
5778 DEFVAR_LISP ("first-change-hook", &Vfirst_change_hook,
40108
6084dfa5f85d Reindent DEFUNs and DEFVARs woth doc: keywords.
Pavel Janík <Pavel@Janik.cz>
parents: 39988
diff changeset
5779 doc: /* A list of functions to call before changing a buffer which is unmodified.
39971
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5780 The functions are run using the `run-hooks' function. */);
1821
04fb1d3d6992 JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents: 1707
diff changeset
5781 Vfirst_change_hook = Qnil;
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5782
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39974
diff changeset
5783 DEFVAR_PER_BUFFER ("buffer-undo-list", &current_buffer->undo_list, Qnil,
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39974
diff changeset
5784 doc: /* List of undo entries in current buffer.
39971
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5785 Recent changes come first; older changes follow newer.
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5786
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5787 An entry (BEG . END) represents an insertion which begins at
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5788 position BEG and ends at position END.
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5789
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5790 An entry (TEXT . POSITION) represents the deletion of the string TEXT
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5791 from (abs POSITION). If POSITION is positive, point was at the front
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5792 of the text being deleted; if negative, point was at the end.
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5793
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5794 An entry (t HIGH . LOW) indicates that the buffer previously had
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5795 \"unmodified\" status. HIGH and LOW are the high and low 16-bit portions
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5796 of the visited file's modification time, as of that time. If the
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5797 modification time of the most recent save is different, this entry is
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5798 obsolete.
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5799
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5800 An entry (nil PROPERTY VALUE BEG . END) indicates that a text property
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5801 was modified between BEG and END. PROPERTY is the property name,
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5802 and VALUE is the old value.
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5803
59833
62b43d677801 (syms_of_buffer) <buffer-undo-list>: Doc fix.
Kim F. Storm <storm@cua.dk>
parents: 59780
diff changeset
5804 An entry (apply FUN-NAME . ARGS) means undo the change with
62b43d677801 (syms_of_buffer) <buffer-undo-list>: Doc fix.
Kim F. Storm <storm@cua.dk>
parents: 59780
diff changeset
5805 \(apply FUN-NAME ARGS).
62b43d677801 (syms_of_buffer) <buffer-undo-list>: Doc fix.
Kim F. Storm <storm@cua.dk>
parents: 59780
diff changeset
5806
62b43d677801 (syms_of_buffer) <buffer-undo-list>: Doc fix.
Kim F. Storm <storm@cua.dk>
parents: 59780
diff changeset
5807 An entry (apply DELTA BEG END FUN-NAME . ARGS) supports selective undo
62b43d677801 (syms_of_buffer) <buffer-undo-list>: Doc fix.
Kim F. Storm <storm@cua.dk>
parents: 59780
diff changeset
5808 in the active region. BEG and END is the range affected by this entry
62b43d677801 (syms_of_buffer) <buffer-undo-list>: Doc fix.
Kim F. Storm <storm@cua.dk>
parents: 59780
diff changeset
5809 and DELTA is the number of bytes added or deleted in that range by
62b43d677801 (syms_of_buffer) <buffer-undo-list>: Doc fix.
Kim F. Storm <storm@cua.dk>
parents: 59780
diff changeset
5810 this change.
59780
9d293bf75d6c (syms_of_buffer) <buffer-undo-list>: Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 59194
diff changeset
5811
39971
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5812 An entry (MARKER . DISTANCE) indicates that the marker MARKER
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5813 was adjusted in position by the offset DISTANCE (an integer).
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5814
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5815 An entry of the form POSITION indicates that point was at the buffer
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5816 location given by the integer. Undoing an entry of this form places
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5817 point at POSITION.
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5818
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5819 nil marks undo boundaries. The undo command treats the changes
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5820 between two undo boundaries as a single step to be undone.
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5821
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5822 If the value of the variable is t, undo information is not recorded. */);
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5823
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39974
diff changeset
5824 DEFVAR_PER_BUFFER ("mark-active", &current_buffer->mark_active, Qnil,
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39974
diff changeset
5825 doc: /* Non-nil means the mark and region are currently active in this buffer. */);
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39974
diff changeset
5826
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39974
diff changeset
5827 DEFVAR_PER_BUFFER ("cache-long-line-scans", &current_buffer->cache_long_line_scans, Qnil,
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39974
diff changeset
5828 doc: /* Non-nil means that Emacs should use caches to handle long lines more quickly.
39971
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5829
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5830 Normally, the line-motion functions work by scanning the buffer for
57705
804f28bbd89c (syms_of_buffer): Fix a few typos.
David Kastrup <dak@gnu.org>
parents: 57245
diff changeset
5831 newlines. Columnar operations (like `move-to-column' and
804f28bbd89c (syms_of_buffer): Fix a few typos.
David Kastrup <dak@gnu.org>
parents: 57245
diff changeset
5832 `compute-motion') also work by scanning the buffer, summing character
39971
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5833 widths as they go. This works well for ordinary text, but if the
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5834 buffer's lines are very long (say, more than 500 characters), these
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5835 motion functions will take longer to execute. Emacs may also take
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5836 longer to update the display.
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5837
57705
804f28bbd89c (syms_of_buffer): Fix a few typos.
David Kastrup <dak@gnu.org>
parents: 57245
diff changeset
5838 If `cache-long-line-scans' is non-nil, these motion functions cache the
39971
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5839 results of their scans, and consult the cache to avoid rescanning
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5840 regions of the buffer until the text is modified. The caches are most
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5841 beneficial when they prevent the most searching---that is, when the
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5842 buffer contains long lines and large regions of characters with the
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5843 same, fixed screen width.
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5844
57705
804f28bbd89c (syms_of_buffer): Fix a few typos.
David Kastrup <dak@gnu.org>
parents: 57245
diff changeset
5845 When `cache-long-line-scans' is non-nil, processing short lines will
39971
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5846 become slightly slower (because of the overhead of consulting the
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5847 cache), and the caches will use memory roughly proportional to the
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5848 number of newlines and characters whose screen width varies.
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5849
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5850 The caches require no explicit maintenance; their accuracy is
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5851 maintained internally by the Emacs primitives. Enabling or disabling
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5852 the cache should not affect the behavior of any of the motion
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5853 functions; it should only affect their performance. */);
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5854
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39974
diff changeset
5855 DEFVAR_PER_BUFFER ("point-before-scroll", &current_buffer->point_before_scroll, Qnil,
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39974
diff changeset
5856 doc: /* Value of point before the last series of scroll operations, or nil. */);
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39974
diff changeset
5857
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39974
diff changeset
5858 DEFVAR_PER_BUFFER ("buffer-file-format", &current_buffer->file_format, Qnil,
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39974
diff changeset
5859 doc: /* List of formats to use when saving this buffer.
39971
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5860 Formats are defined by `format-alist'. This variable is
50304
d9d826db650f (overlays_in): Declare static.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50014
diff changeset
5861 set when a file is visited. */);
11052
35664a2851e7 (reset_buffer): Reset file_format element too.(init_buffer_once): Define file_format flag; reset file_format.
Boris Goldowsky <boris@gnu.org>
parents: 11000
diff changeset
5862
56976
b3aa8cb4c381 (reset_buffer, init_buffer_once): Handle auto_save_file_format field.
Luc Teirlinck <teirllm@auburn.edu>
parents: 56669
diff changeset
5863 DEFVAR_PER_BUFFER ("buffer-auto-save-file-format",
b3aa8cb4c381 (reset_buffer, init_buffer_once): Handle auto_save_file_format field.
Luc Teirlinck <teirllm@auburn.edu>
parents: 56669
diff changeset
5864 &current_buffer->auto_save_file_format, Qnil,
b3aa8cb4c381 (reset_buffer, init_buffer_once): Handle auto_save_file_format field.
Luc Teirlinck <teirllm@auburn.edu>
parents: 56669
diff changeset
5865 doc: /* *Format in which to write auto-save files.
b3aa8cb4c381 (reset_buffer, init_buffer_once): Handle auto_save_file_format field.
Luc Teirlinck <teirllm@auburn.edu>
parents: 56669
diff changeset
5866 Should be a list of symbols naming formats that are defined in `format-alist'.
b3aa8cb4c381 (reset_buffer, init_buffer_once): Handle auto_save_file_format field.
Luc Teirlinck <teirllm@auburn.edu>
parents: 56669
diff changeset
5867 If it is t, which is the default, auto-save files are written in the
b3aa8cb4c381 (reset_buffer, init_buffer_once): Handle auto_save_file_format field.
Luc Teirlinck <teirllm@auburn.edu>
parents: 56669
diff changeset
5868 same format as a regular save would use. */);
b3aa8cb4c381 (reset_buffer, init_buffer_once): Handle auto_save_file_format field.
Luc Teirlinck <teirllm@auburn.edu>
parents: 56669
diff changeset
5869
10967
b53b84b6f46d (reset_buffer_local_variables): Init invisibility.
Richard M. Stallman <rms@gnu.org>
parents: 10916
diff changeset
5870 DEFVAR_PER_BUFFER ("buffer-invisibility-spec",
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39974
diff changeset
5871 &current_buffer->invisibility_spec, Qnil,
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39974
diff changeset
5872 doc: /* Invisibility spec of this buffer.
39971
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5873 The default is t, which means that text is invisible
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5874 if it has a non-nil `invisible' property.
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5875 If the value is a list, a text character is invisible if its `invisible'
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5876 property is an element in that list.
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5877 If an element is a cons cell of the form (PROP . ELLIPSIS),
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5878 then characters with property value PROP are invisible,
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5879 and they have an ellipsis as well if ELLIPSIS is non-nil. */);
10967
b53b84b6f46d (reset_buffer_local_variables): Init invisibility.
Richard M. Stallman <rms@gnu.org>
parents: 10916
diff changeset
5880
17218
a57ca25e9c62 (reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents: 17124
diff changeset
5881 DEFVAR_PER_BUFFER ("buffer-display-count",
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39974
diff changeset
5882 &current_buffer->display_count, Qnil,
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39974
diff changeset
5883 doc: /* A number incremented each time this buffer is displayed in a window.
39971
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5884 The function `set-window-buffer' increments it. */);
22150
b6edeb61a779 (syms_of_buffer): Set up Lisp variable buffer-display-time.
Richard M. Stallman <rms@gnu.org>
parents: 22023
diff changeset
5885
b6edeb61a779 (syms_of_buffer): Set up Lisp variable buffer-display-time.
Richard M. Stallman <rms@gnu.org>
parents: 22023
diff changeset
5886 DEFVAR_PER_BUFFER ("buffer-display-time",
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39974
diff changeset
5887 &current_buffer->display_time, Qnil,
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39974
diff changeset
5888 doc: /* Time stamp updated each time this buffer is displayed in a window.
39971
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5889 The function `set-window-buffer' updates this variable
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5890 to the value obtained by calling `current-time'.
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5891 If the buffer has never been shown in a window, the value is nil. */);
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5892
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39974
diff changeset
5893 DEFVAR_LISP ("transient-mark-mode", &Vtransient_mark_mode,
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39974
diff changeset
5894 doc: /* *Non-nil means deactivate the mark when the buffer contents change.
39971
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5895 Non-nil also enables highlighting of the region whenever the mark is active.
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5896 The variable `highlight-nonselected-windows' controls whether to highlight
56172
e9132cd92733 (syms_of_buffer): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 56138
diff changeset
5897 all windows or just the selected window.
e9132cd92733 (syms_of_buffer): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 56138
diff changeset
5898
e9132cd92733 (syms_of_buffer): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 56138
diff changeset
5899 If the value is `lambda', that enables Transient Mark mode temporarily
e9132cd92733 (syms_of_buffer): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 56138
diff changeset
5900 until the next buffer modification. If a command sets the value to `only',
56452
ff1b3d52a8cd (syms_of_buffer) <transient-mark-mode>: Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 56396
diff changeset
5901 that enables Transient Mark mode for the following command only.
ff1b3d52a8cd (syms_of_buffer) <transient-mark-mode>: Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 56396
diff changeset
5902 During that following command, the value of `transient-mark-mode'
ff1b3d52a8cd (syms_of_buffer) <transient-mark-mode>: Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 56396
diff changeset
5903 is `identity'. If it is still `identity' at the end of that command,
ff1b3d52a8cd (syms_of_buffer) <transient-mark-mode>: Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 56396
diff changeset
5904 it changes to nil. */);
2043
a1ab3501653c (reset_buffer_local_variables): Reset mark_active.
Richard M. Stallman <rms@gnu.org>
parents: 2020
diff changeset
5905 Vtransient_mark_mode = Qnil;
a1ab3501653c (reset_buffer_local_variables): Reset mark_active.
Richard M. Stallman <rms@gnu.org>
parents: 2020
diff changeset
5906
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39974
diff changeset
5907 DEFVAR_LISP ("inhibit-read-only", &Vinhibit_read_only,
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39974
diff changeset
5908 doc: /* *Non-nil means disregard read-only status of buffers or characters.
39971
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5909 If the value is t, disregard `buffer-read-only' and all `read-only'
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5910 text properties. If the value is a list, disregard `buffer-read-only'
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5911 and disregard a `read-only' text property if the property value
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5912 is a member of the list. */);
3481
56424e6245c2 (syms_of_buffer): Set up Lisp var inhibit-read-only.
Richard M. Stallman <rms@gnu.org>
parents: 3463
diff changeset
5913 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
5914
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39974
diff changeset
5915 DEFVAR_PER_BUFFER ("cursor-type", &current_buffer->cursor_type, Qnil,
45421
4c14a5806a68 (syms_of_buffer) <cursor-type>: Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 45393
diff changeset
5916 doc: /* Cursor to use when this buffer is in the selected window.
39971
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5917 Values are interpreted as follows:
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5918
64572
339bbffbcd05 (syms_of_buffer) <cursor-type>: Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents: 64469
diff changeset
5919 t use the cursor specified for the frame
339bbffbcd05 (syms_of_buffer) <cursor-type>: Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents: 64469
diff changeset
5920 nil don't display a cursor
339bbffbcd05 (syms_of_buffer) <cursor-type>: Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents: 64469
diff changeset
5921 box display a filled box cursor
339bbffbcd05 (syms_of_buffer) <cursor-type>: Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents: 64469
diff changeset
5922 hollow display a hollow box cursor
339bbffbcd05 (syms_of_buffer) <cursor-type>: Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents: 64469
diff changeset
5923 bar display a vertical bar cursor with default width
339bbffbcd05 (syms_of_buffer) <cursor-type>: Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents: 64469
diff changeset
5924 (bar . WIDTH) display a vertical bar cursor with width WIDTH
339bbffbcd05 (syms_of_buffer) <cursor-type>: Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents: 64469
diff changeset
5925 hbar display a horizontal bar cursor with default height
63570
7b153a401f5c Finish previous change.
Richard M. Stallman <rms@gnu.org>
parents: 63545
diff changeset
5926 (hbar . HEIGHT) display a horizontal bar cursor with height HEIGHT
64572
339bbffbcd05 (syms_of_buffer) <cursor-type>: Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents: 64469
diff changeset
5927 ANYTHING ELSE display a hollow box cursor
45421
4c14a5806a68 (syms_of_buffer) <cursor-type>: Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 45393
diff changeset
5928
4c14a5806a68 (syms_of_buffer) <cursor-type>: Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 45393
diff changeset
5929 When the buffer is displayed in a nonselected window,
4c14a5806a68 (syms_of_buffer) <cursor-type>: Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 45393
diff changeset
5930 this variable has no effect; the cursor appears as a hollow box. */);
28322
986882bafaf1 (reset_buffer): Initialize buffer's cursor_type.
Gerd Moellmann <gerd@gnu.org>
parents: 28314
diff changeset
5931
28688
3c44b2f54f82 (init_buffer_once): Handle extra_line_spacing.
Gerd Moellmann <gerd@gnu.org>
parents: 28636
diff changeset
5932 DEFVAR_PER_BUFFER ("line-spacing",
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39974
diff changeset
5933 &current_buffer->extra_line_spacing, Qnil,
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39974
diff changeset
5934 doc: /* Additional space to put between lines when displaying a buffer.
55242
d57364949309 (syms_of_buffer) <line-spacing>: Allow float value.
Kim F. Storm <storm@cua.dk>
parents: 55140
diff changeset
5935 The space is measured in pixels, and put below lines on window systems.
d57364949309 (syms_of_buffer) <line-spacing>: Allow float value.
Kim F. Storm <storm@cua.dk>
parents: 55140
diff changeset
5936 If value is a floating point number, it specifies the spacing relative
d57364949309 (syms_of_buffer) <line-spacing>: Allow float value.
Kim F. Storm <storm@cua.dk>
parents: 55140
diff changeset
5937 to the default frame line height. */);
39971
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5938
62030
bc82609e1655 (syms_of_buffer): Define cursor-in-non-selected-windows.
Richard M. Stallman <rms@gnu.org>
parents: 61445
diff changeset
5939 DEFVAR_PER_BUFFER ("cursor-in-non-selected-windows",
62069
a0a348c8b14b (init_buffer_once): Set cursor_in_non_selected_windows default value.
Kim F. Storm <storm@cua.dk>
parents: 62030
diff changeset
5940 &current_buffer->cursor_in_non_selected_windows, Qnil,
62030
bc82609e1655 (syms_of_buffer): Define cursor-in-non-selected-windows.
Richard M. Stallman <rms@gnu.org>
parents: 61445
diff changeset
5941 doc: /* *Cursor type to display in non-selected windows.
bc82609e1655 (syms_of_buffer): Define cursor-in-non-selected-windows.
Richard M. Stallman <rms@gnu.org>
parents: 61445
diff changeset
5942 t means to use hollow box cursor. See `cursor-type' for other values. */);
bc82609e1655 (syms_of_buffer): Define cursor-in-non-selected-windows.
Richard M. Stallman <rms@gnu.org>
parents: 61445
diff changeset
5943
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39974
diff changeset
5944 DEFVAR_LISP ("kill-buffer-query-functions", &Vkill_buffer_query_functions,
40108
6084dfa5f85d Reindent DEFUNs and DEFVARs woth doc: keywords.
Pavel Janík <Pavel@Janik.cz>
parents: 39988
diff changeset
5945 doc: /* List of functions called with no args to query before killing a buffer. */);
6051
0b144d967f30 (Fkill_buffer): Call the Vkill_buffer_query_functions.
Richard M. Stallman <rms@gnu.org>
parents: 5904
diff changeset
5946 Vkill_buffer_query_functions = Qnil;
0b144d967f30 (Fkill_buffer): Call the Vkill_buffer_query_functions.
Richard M. Stallman <rms@gnu.org>
parents: 5904
diff changeset
5947
14506
bddd8114eaa9 (Fbuffer_live_p): New function.
Richard M. Stallman <rms@gnu.org>
parents: 14481
diff changeset
5948 defsubr (&Sbuffer_live_p);
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5949 defsubr (&Sbuffer_list);
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5950 defsubr (&Sget_buffer);
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5951 defsubr (&Sget_file_buffer);
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5952 defsubr (&Sget_buffer_create);
10314
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
5953 defsubr (&Smake_indirect_buffer);
392
dce611246f59 *** empty log message ***
Roland McGrath <roland@gnu.org>
parents: 333
diff changeset
5954 defsubr (&Sgenerate_new_buffer_name);
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5955 defsubr (&Sbuffer_name);
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5956 /*defsubr (&Sbuffer_number);*/
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5957 defsubr (&Sbuffer_file_name);
10314
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
5958 defsubr (&Sbuffer_base_buffer);
40725
a8af2e89346c (Fbuffer_local_value): New function.
Richard M. Stallman <rms@gnu.org>
parents: 40656
diff changeset
5959 defsubr (&Sbuffer_local_value);
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5960 defsubr (&Sbuffer_local_variables);
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5961 defsubr (&Sbuffer_modified_p);
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5962 defsubr (&Sset_buffer_modified_p);
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5963 defsubr (&Sbuffer_modified_tick);
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5964 defsubr (&Srename_buffer);
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5965 defsubr (&Sother_buffer);
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5966 defsubr (&Sbuffer_enable_undo);
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5967 defsubr (&Skill_buffer);
9732
577db538b0b6 (Fset_buffer_major_mode): New function. Set the default major mode here.
Karl Heuer <kwzh@gnu.org>
parents: 9632
diff changeset
5968 defsubr (&Sset_buffer_major_mode);
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5969 defsubr (&Sswitch_to_buffer);
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5970 defsubr (&Spop_to_buffer);
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5971 defsubr (&Scurrent_buffer);
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5972 defsubr (&Sset_buffer);
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5973 defsubr (&Sbarf_if_buffer_read_only);
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5974 defsubr (&Sbury_buffer);
20679
a9d566444dd4 (Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20586
diff changeset
5975 defsubr (&Serase_buffer);
a9d566444dd4 (Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20586
diff changeset
5976 defsubr (&Sset_buffer_multibyte);
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5977 defsubr (&Skill_all_local_variables);
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
5978
2776
8bf3bb4c20dd * lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents: 2722
diff changeset
5979 defsubr (&Soverlayp);
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
5980 defsubr (&Smake_overlay);
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
5981 defsubr (&Sdelete_overlay);
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
5982 defsubr (&Smove_overlay);
2787
995c6e665599 * buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents: 2776
diff changeset
5983 defsubr (&Soverlay_start);
995c6e665599 * buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents: 2776
diff changeset
5984 defsubr (&Soverlay_end);
995c6e665599 * buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents: 2776
diff changeset
5985 defsubr (&Soverlay_buffer);
995c6e665599 * buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents: 2776
diff changeset
5986 defsubr (&Soverlay_properties);
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
5987 defsubr (&Soverlays_at);
12382
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
5988 defsubr (&Soverlays_in);
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
5989 defsubr (&Snext_overlay_change);
8967
80b92977ed08 (overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents: 8924
diff changeset
5990 defsubr (&Sprevious_overlay_change);
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
5991 defsubr (&Soverlay_recenter);
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
5992 defsubr (&Soverlay_lists);
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
5993 defsubr (&Soverlay_get);
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
5994 defsubr (&Soverlay_put);
28518
5da961b04d97 (Frestore_buffer_modified_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28417
diff changeset
5995 defsubr (&Srestore_buffer_modified_p);
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5996 }
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5997
21514
fa9ff387d260 Fix -Wimplicit warnings.
Andreas Schwab <schwab@suse.de>
parents: 21506
diff changeset
5998 void
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5999 keys_of_buffer ()
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
6000 {
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
6001 initial_define_key (control_x_map, 'b', "switch-to-buffer");
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
6002 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
6003
2c5f3537a1cc (syms_of_buffer): Don't do (put 'erase-buffer 'disabled t) here.
Roland McGrath <roland@gnu.org>
parents: 5502
diff changeset
6004 /* 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
6005 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
6006 Fput (intern ("erase-buffer"), Qdisabled, Qt);
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
6007 }
52401
695cf19ef79e Add arch taglines
Miles Bader <miles@gnu.org>
parents: 52253
diff changeset
6008
695cf19ef79e Add arch taglines
Miles Bader <miles@gnu.org>
parents: 52253
diff changeset
6009 /* arch-tag: e48569bf-69a9-4b65-a23b-8e68769436e1
695cf19ef79e Add arch taglines
Miles Bader <miles@gnu.org>
parents: 52253
diff changeset
6010 (do not change this comment) */