annotate src/buffer.c @ 112147:cd1f0a133995

Merge from mainline.
author Paul Eggert <eggert@cs.ucla.edu>
date Fri, 07 Jan 2011 11:43:46 -0800
parents ac49e05bfcf2
children 417b1e4d63cd 7df2e30d72ec
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.
111123
cc83220d255d Sync docs of cursor-in-non-selected-windows between Lisp and C.
Glenn Morris <rgm@gnu.org>
parents: 110855
diff changeset
2
cc83220d255d Sync docs of cursor-in-non-selected-windows between Lisp and C.
Glenn Morris <rgm@gnu.org>
parents: 110855
diff changeset
3 Copyright (C) 1985, 1986, 1987, 1988, 1989, 1993, 1994, 1995, 1997,
cc83220d255d Sync docs of cursor-in-non-selected-windows between Lisp and C.
Glenn Morris <rgm@gnu.org>
parents: 110855
diff changeset
4 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
cc83220d255d Sync docs of cursor-in-non-selected-windows between Lisp and C.
Glenn Morris <rgm@gnu.org>
parents: 110855
diff changeset
5 2009, 2010 Free Software Foundation, Inc.
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
6
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
7 This file is part of GNU Emacs.
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
8
94963
8971ddf55736 Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents: 94249
diff changeset
9 GNU Emacs is free software: you can redistribute it and/or modify
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
10 it under the terms of the GNU General Public License as published by
94963
8971ddf55736 Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents: 94249
diff changeset
11 the Free Software Foundation, either version 3 of the License, or
8971ddf55736 Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents: 94249
diff changeset
12 (at your option) any later version.
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
13
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
14 GNU Emacs is distributed in the hope that it will be useful,
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
15 but WITHOUT ANY WARRANTY; without even the implied warranty of
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
16 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
17 GNU General Public License for more details.
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
18
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
19 You should have received a copy of the GNU General Public License
94963
8971ddf55736 Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents: 94249
diff changeset
20 along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
21
26088
b7aa6ac26872 Add support for large files, 64-bit Solaris, system locale codings.
Paul Eggert <eggert@twinsun.com>
parents: 26056
diff changeset
22 #include <config.h>
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
23
1563
e721339972b0 * buffer.c (init_buffer): If PWD is accurate, use it instead of
Jim Blandy <jimb@redhat.com>
parents: 1501
diff changeset
24 #include <sys/types.h>
e721339972b0 * buffer.c (init_buffer): If PWD is accurate, use it instead of
Jim Blandy <jimb@redhat.com>
parents: 1501
diff changeset
25 #include <sys/stat.h>
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
26 #include <sys/param.h>
19581
30f977ea74db Include errno.h.
Richard M. Stallman <rms@gnu.org>
parents: 19466
diff changeset
27 #include <errno.h>
31886
ca37d343042c Include stdio.h.
Dave Love <fx@gnu.org>
parents: 31612
diff changeset
28 #include <stdio.h>
105669
68dd71358159 * alloc.c: Do not define struct catchtag.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105641
diff changeset
29 #include <setjmp.h>
19581
30f977ea74db Include errno.h.
Richard M. Stallman <rms@gnu.org>
parents: 19466
diff changeset
30
21514
fa9ff387d260 Fix -Wimplicit warnings.
Andreas Schwab <schwab@suse.de>
parents: 21506
diff changeset
31 #ifdef HAVE_UNISTD_H
fa9ff387d260 Fix -Wimplicit warnings.
Andreas Schwab <schwab@suse.de>
parents: 21506
diff changeset
32 #include <unistd.h>
fa9ff387d260 Fix -Wimplicit warnings.
Andreas Schwab <schwab@suse.de>
parents: 21506
diff changeset
33 #endif
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39974
diff changeset
34
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
35 #include "lisp.h"
1308
2660a7053836 * buffer.c: #include intervals.h.
Joseph Arceneaux <jla@gnu.org>
parents: 1291
diff changeset
36 #include "intervals.h"
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
37 #include "window.h"
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
38 #include "commands.h"
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
39 #include "buffer.h"
88354
8a0cda2f3c85 Include "character.h" instead of "charset.h", don't include
Kenichi Handa <handa@m17n.org>
parents: 42982
diff changeset
40 #include "character.h"
9403
9f797989b817 * buffer.c: #include region-cache.h.
Jim Blandy <jimb@redhat.com>
parents: 9362
diff changeset
41 #include "region-cache.h"
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
42 #include "indent.h"
2480
6f4b9c548425 Include blockinput.h.
Richard M. Stallman <rms@gnu.org>
parents: 2439
diff changeset
43 #include "blockinput.h"
31102
6a0caa788013 Include keyboard.h before frame.h.
Andrew Innes <andrewi@gnu.org>
parents: 30911
diff changeset
44 #include "keyboard.h"
39748
42b7a798ff79 Include keymap.h.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39581
diff changeset
45 #include "keymap.h"
18455
9f5626727351 (Fbuffer_list): New optional argument FRAME.
Richard M. Stallman <rms@gnu.org>
parents: 18178
diff changeset
46 #include "frame.h"
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
47
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
48 struct buffer *current_buffer; /* the current buffer */
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
49
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
50 /* First buffer in chain of all buffers (in reverse order of creation).
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
51 Threaded through ->next. */
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 *all_buffers;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
54
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
55 /* This structure holds the default values of the buffer-local variables
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
56 defined with DEFVAR_PER_BUFFER, that have special slots in each buffer.
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
57 The default value occupies the same slot in this structure
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
58 as an individual buffer's value occupies in that buffer.
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
59 Setting the default value also goes through the alist of buffers
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
60 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
61
53655
4f64423a6040 (buffer_defaults, buffer_local_symbols): Use DECL_ALIGN.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53602
diff changeset
62 DECL_ALIGN (struct buffer, buffer_defaults);
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
63
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
64 /* A Lisp_Object pointer to the above, used for staticpro */
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
65
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
66 static Lisp_Object Vbuffer_defaults;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
67
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
68 /* This structure marks which slots in a buffer have corresponding
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
69 default values in buffer_defaults.
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
70 Each such slot has a nonzero value in this structure.
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
71 The value has only one nonzero bit.
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
72
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
73 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
74 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
75 is turned on in the buffer's local_flags array.
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
76
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
77 If a slot in this structure is -1, then even though there may
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
78 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
79 and the corresponding slot in buffer_defaults is not used.
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
80
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
81 If a slot in this structure corresponding to a DEFVAR_PER_BUFFER is
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
82 zero, that is a bug */
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
83
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
84 struct buffer buffer_local_flags;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
85
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
86 /* This structure holds the names of symbols whose values may be
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
87 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
88
53655
4f64423a6040 (buffer_defaults, buffer_local_symbols): Use DECL_ALIGN.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 53602
diff changeset
89 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
90
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
91 /* A Lisp_Object pointer to the above, used for staticpro */
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
92 static Lisp_Object Vbuffer_local_symbols;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
93
107984
bef5d1738c0b Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 107845
diff changeset
94 /* Return the symbol of the per-buffer variable at offset OFFSET in
bef5d1738c0b Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 107845
diff changeset
95 the buffer structure. */
bef5d1738c0b Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 107845
diff changeset
96
bef5d1738c0b Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 107845
diff changeset
97 #define PER_BUFFER_SYMBOL(OFFSET) \
bef5d1738c0b Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 107845
diff changeset
98 (*(Lisp_Object *)((OFFSET) + (char *) &buffer_local_symbols))
bef5d1738c0b Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 107845
diff changeset
99
15776
6018e01d4466 (buffer_permanent_local_flags): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 15638
diff changeset
100 /* 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
101 are permanent locals. */
28352
1555145f8c35 (buffer_permanent_local_flags): Use MAX_PER_BUFFER_VARS
Gerd Moellmann <gerd@gnu.org>
parents: 28332
diff changeset
102 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
103
c46e609d887a (buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents: 28207
diff changeset
104 /* Number of per-buffer variables used. */
c46e609d887a (buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents: 28207
diff changeset
105
28352
1555145f8c35 (buffer_permanent_local_flags): Use MAX_PER_BUFFER_VARS
Gerd Moellmann <gerd@gnu.org>
parents: 28332
diff changeset
106 int last_per_buffer_idx;
15776
6018e01d4466 (buffer_permanent_local_flags): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 15638
diff changeset
107
109100
2bc9a0c04c87 Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents: 108890
diff changeset
108 static void call_overlay_mod_hooks (Lisp_Object list, Lisp_Object overlay,
2bc9a0c04c87 Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents: 108890
diff changeset
109 int after, Lisp_Object arg1,
2bc9a0c04c87 Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents: 108890
diff changeset
110 Lisp_Object arg2, Lisp_Object arg3);
2bc9a0c04c87 Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents: 108890
diff changeset
111 static void swap_out_buffer_local_variables (struct buffer *b);
2bc9a0c04c87 Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents: 108890
diff changeset
112 static void reset_buffer_local_variables (struct buffer *b, int permanent_too);
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
113
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
114 /* Alist of all buffer names vs the buffers. */
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
115 /* This used to be a variable, but is no longer,
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
116 to prevent lossage due to user rplac'ing this alist or its elements. */
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
117 Lisp_Object Vbuffer_alist;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
118
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
119 /* Functions to call before and after each text change. */
6785
121f2c5eba5e (Vafter_change_functions, Vbefore_change_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 6697
diff changeset
120 Lisp_Object Vbefore_change_functions;
121f2c5eba5e (Vafter_change_functions, Vbefore_change_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 6697
diff changeset
121 Lisp_Object Vafter_change_functions;
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
122
2043
a1ab3501653c (reset_buffer_local_variables): Reset mark_active.
Richard M. Stallman <rms@gnu.org>
parents: 2020
diff changeset
123 Lisp_Object Vtransient_mark_mode;
a1ab3501653c (reset_buffer_local_variables): Reset mark_active.
Richard M. Stallman <rms@gnu.org>
parents: 2020
diff changeset
124
3481
56424e6245c2 (syms_of_buffer): Set up Lisp var inhibit-read-only.
Richard M. Stallman <rms@gnu.org>
parents: 3463
diff changeset
125 /* 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
126 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
127 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
128 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
129
6051
0b144d967f30 (Fkill_buffer): Call the Vkill_buffer_query_functions.
Richard M. Stallman <rms@gnu.org>
parents: 5904
diff changeset
130 /* 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
131 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
132 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
133 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
134
72299
e97bfa736263 * buffer.c (Vchange_major_mode_hook, Qchange_major_mode_hook): New vars.
Chong Yidong <cyd@stupidchicken.com>
parents: 71968
diff changeset
135 /* Hook run before changing a major mode. */
e97bfa736263 * buffer.c (Vchange_major_mode_hook, Qchange_major_mode_hook): New vars.
Chong Yidong <cyd@stupidchicken.com>
parents: 71968
diff changeset
136 Lisp_Object Vchange_major_mode_hook, Qchange_major_mode_hook;
e97bfa736263 * buffer.c (Vchange_major_mode_hook, Qchange_major_mode_hook): New vars.
Chong Yidong <cyd@stupidchicken.com>
parents: 71968
diff changeset
137
1821
04fb1d3d6992 JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents: 1707
diff changeset
138 /* 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
139 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
140
1821
04fb1d3d6992 JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents: 1707
diff changeset
141 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
142 Lisp_Object Qbefore_change_functions;
937df231678c (Qbefore_change_functions, Qafter_change_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 12699
diff changeset
143 Lisp_Object Qafter_change_functions;
48635
2a9a1d761581 (Qucs_set_table_for_input): New.
Dave Love <fx@gnu.org>
parents: 48355
diff changeset
144 Lisp_Object Qucs_set_table_for_input;
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
145
23399
e80c5f687340 (inhibit_modification_hooks): New variable.
Kenichi Handa <handa@m17n.org>
parents: 23174
diff changeset
146 /* If nonzero, all modification hooks are suppressed. */
e80c5f687340 (inhibit_modification_hooks): New variable.
Kenichi Handa <handa@m17n.org>
parents: 23174
diff changeset
147 int inhibit_modification_hooks;
e80c5f687340 (inhibit_modification_hooks): New variable.
Kenichi Handa <handa@m17n.org>
parents: 23174
diff changeset
148
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
149 Lisp_Object Qfundamental_mode, Qmode_class, Qpermanent_local;
87977
0f04103be3bf (reset_buffer_local_variables): Implement `permanent-local-hook'.
Richard M. Stallman <rms@gnu.org>
parents: 87843
diff changeset
150 Lisp_Object Qpermanent_local_hook;
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
151
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
152 Lisp_Object Qprotected_field;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
153
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
154 Lisp_Object QSFundamental; /* A string "Fundamental" */
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
155
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
156 Lisp_Object Qkill_buffer_hook;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
157
5433
7ac1e6f1565f Don't include syntax.h.
Richard M. Stallman <rms@gnu.org>
parents: 5247
diff changeset
158 Lisp_Object Qget_file_buffer;
7ac1e6f1565f Don't include syntax.h.
Richard M. Stallman <rms@gnu.org>
parents: 5247
diff changeset
159
2776
8bf3bb4c20dd * lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents: 2722
diff changeset
160 Lisp_Object Qoverlayp;
8bf3bb4c20dd * lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents: 2722
diff changeset
161
109594
fe23ee097a54 * src/buffer.c (Qwindow): Do not define, already defined in data.c.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109573
diff changeset
162 Lisp_Object Qpriority, Qevaporate, Qbefore_string, Qafter_string;
5857
03f8720af7fb (sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents: 5703
diff changeset
163
4213
616036bb2427 (Qmodification_hooks, Qinsert_in_front_hooks)
Richard M. Stallman <rms@gnu.org>
parents: 4100
diff changeset
164 Lisp_Object Qmodification_hooks;
616036bb2427 (Qmodification_hooks, Qinsert_in_front_hooks)
Richard M. Stallman <rms@gnu.org>
parents: 4100
diff changeset
165 Lisp_Object Qinsert_in_front_hooks;
616036bb2427 (Qmodification_hooks, Qinsert_in_front_hooks)
Richard M. Stallman <rms@gnu.org>
parents: 4100
diff changeset
166 Lisp_Object Qinsert_behind_hooks;
616036bb2427 (Qmodification_hooks, Qinsert_in_front_hooks)
Richard M. Stallman <rms@gnu.org>
parents: 4100
diff changeset
167
109100
2bc9a0c04c87 Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents: 108890
diff changeset
168 static void alloc_buffer_text (struct buffer *, size_t);
2bc9a0c04c87 Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents: 108890
diff changeset
169 static void free_buffer_text (struct buffer *b);
2bc9a0c04c87 Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents: 108890
diff changeset
170 static struct Lisp_Overlay * copy_overlays (struct buffer *, struct Lisp_Overlay *);
2bc9a0c04c87 Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents: 108890
diff changeset
171 static void modify_overlay (struct buffer *, EMACS_INT, EMACS_INT);
2bc9a0c04c87 Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents: 108890
diff changeset
172 static Lisp_Object buffer_lisp_local_variables (struct buffer *);
31604
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
173
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
174 /* For debugging; temporary. See set_buffer_internal. */
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
175 /* Lisp_Object Qlisp_mode, Vcheck_symbol; */
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
176
20368
9f5fab56f4b3 (nsberror, record_buffer, validate_region,
Kenichi Handa <handa@m17n.org>
parents: 20186
diff changeset
177 void
109144
7dceae91724c Convert most remaining function definitions to standard C.
Juanma Barranquero <lekktu@gmail.com>
parents: 109100
diff changeset
178 nsberror (Lisp_Object spec)
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
179 {
9146
8f966cc4652b (nsberror, Fget_buffer, Fget_file_buffer, Fbuffer_local_variables,
Karl Heuer <kwzh@gnu.org>
parents: 9047
diff changeset
180 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
181 error ("No buffer named %s", SDATA (spec));
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
182 error ("Invalid buffer argument");
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
183 }
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
184
14506
bddd8114eaa9 (Fbuffer_live_p): New function.
Richard M. Stallman <rms@gnu.org>
parents: 14481
diff changeset
185 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
186 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
187 Value is nil if OBJECT is not a buffer or if it has been killed. */)
109179
8cfee7d2955f Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109165
diff changeset
188 (Lisp_Object object)
14506
bddd8114eaa9 (Fbuffer_live_p): New function.
Richard M. Stallman <rms@gnu.org>
parents: 14481
diff changeset
189 {
bddd8114eaa9 (Fbuffer_live_p): New function.
Richard M. Stallman <rms@gnu.org>
parents: 14481
diff changeset
190 return ((BUFFERP (object) && ! NILP (XBUFFER (object)->name))
bddd8114eaa9 (Fbuffer_live_p): New function.
Richard M. Stallman <rms@gnu.org>
parents: 14481
diff changeset
191 ? Qt : Qnil);
bddd8114eaa9 (Fbuffer_live_p): New function.
Richard M. Stallman <rms@gnu.org>
parents: 14481
diff changeset
192 }
bddd8114eaa9 (Fbuffer_live_p): New function.
Richard M. Stallman <rms@gnu.org>
parents: 14481
diff changeset
193
18455
9f5626727351 (Fbuffer_list): New optional argument FRAME.
Richard M. Stallman <rms@gnu.org>
parents: 18178
diff changeset
194 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
195 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
196 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
197 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
198 frame parameter come first, followed by the rest of the buffers. */)
109179
8cfee7d2955f Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109165
diff changeset
199 (Lisp_Object frame)
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
200 {
83415
d2c799f58129 Implement full support for frame-local `next-buffer' and `previous-buffer'.
Karoly Lorentey <lorentey@elte.hu>
parents: 83407
diff changeset
201 Lisp_Object general;
18455
9f5626727351 (Fbuffer_list): New optional argument FRAME.
Richard M. Stallman <rms@gnu.org>
parents: 18178
diff changeset
202 general = Fmapcar (Qcdr, Vbuffer_alist);
9f5626727351 (Fbuffer_list): New optional argument FRAME.
Richard M. Stallman <rms@gnu.org>
parents: 18178
diff changeset
203
9f5626727351 (Fbuffer_list): New optional argument FRAME.
Richard M. Stallman <rms@gnu.org>
parents: 18178
diff changeset
204 if (FRAMEP (frame))
9f5626727351 (Fbuffer_list): New optional argument FRAME.
Richard M. Stallman <rms@gnu.org>
parents: 18178
diff changeset
205 {
83415
d2c799f58129 Implement full support for frame-local `next-buffer' and `previous-buffer'.
Karoly Lorentey <lorentey@elte.hu>
parents: 83407
diff changeset
206 Lisp_Object framelist, prevlist, tail;
d2c799f58129 Implement full support for frame-local `next-buffer' and `previous-buffer'.
Karoly Lorentey <lorentey@elte.hu>
parents: 83407
diff changeset
207 Lisp_Object args[3];
18455
9f5626727351 (Fbuffer_list): New optional argument FRAME.
Richard M. Stallman <rms@gnu.org>
parents: 18178
diff changeset
208
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40605
diff changeset
209 CHECK_FRAME (frame);
18455
9f5626727351 (Fbuffer_list): New optional argument FRAME.
Richard M. Stallman <rms@gnu.org>
parents: 18178
diff changeset
210
9f5626727351 (Fbuffer_list): New optional argument FRAME.
Richard M. Stallman <rms@gnu.org>
parents: 18178
diff changeset
211 framelist = Fcopy_sequence (XFRAME (frame)->buffer_list);
83415
d2c799f58129 Implement full support for frame-local `next-buffer' and `previous-buffer'.
Karoly Lorentey <lorentey@elte.hu>
parents: 83407
diff changeset
212 prevlist = Fnreverse (Fcopy_sequence (XFRAME (frame)->buried_buffer_list));
d2c799f58129 Implement full support for frame-local `next-buffer' and `previous-buffer'.
Karoly Lorentey <lorentey@elte.hu>
parents: 83407
diff changeset
213
d2c799f58129 Implement full support for frame-local `next-buffer' and `previous-buffer'.
Karoly Lorentey <lorentey@elte.hu>
parents: 83407
diff changeset
214 /* Remove from GENERAL any buffer that duplicates one in
d2c799f58129 Implement full support for frame-local `next-buffer' and `previous-buffer'.
Karoly Lorentey <lorentey@elte.hu>
parents: 83407
diff changeset
215 FRAMELIST or PREVLIST. */
18455
9f5626727351 (Fbuffer_list): New optional argument FRAME.
Richard M. Stallman <rms@gnu.org>
parents: 18178
diff changeset
216 tail = framelist;
83415
d2c799f58129 Implement full support for frame-local `next-buffer' and `previous-buffer'.
Karoly Lorentey <lorentey@elte.hu>
parents: 83407
diff changeset
217 while (CONSP (tail))
18455
9f5626727351 (Fbuffer_list): New optional argument FRAME.
Richard M. Stallman <rms@gnu.org>
parents: 18178
diff changeset
218 {
26164
d39ec0a27081 more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents: 26088
diff changeset
219 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
220 tail = XCDR (tail);
18455
9f5626727351 (Fbuffer_list): New optional argument FRAME.
Richard M. Stallman <rms@gnu.org>
parents: 18178
diff changeset
221 }
83415
d2c799f58129 Implement full support for frame-local `next-buffer' and `previous-buffer'.
Karoly Lorentey <lorentey@elte.hu>
parents: 83407
diff changeset
222 tail = prevlist;
d2c799f58129 Implement full support for frame-local `next-buffer' and `previous-buffer'.
Karoly Lorentey <lorentey@elte.hu>
parents: 83407
diff changeset
223 while (CONSP (tail))
d2c799f58129 Implement full support for frame-local `next-buffer' and `previous-buffer'.
Karoly Lorentey <lorentey@elte.hu>
parents: 83407
diff changeset
224 {
d2c799f58129 Implement full support for frame-local `next-buffer' and `previous-buffer'.
Karoly Lorentey <lorentey@elte.hu>
parents: 83407
diff changeset
225 general = Fdelq (XCAR (tail), general);
d2c799f58129 Implement full support for frame-local `next-buffer' and `previous-buffer'.
Karoly Lorentey <lorentey@elte.hu>
parents: 83407
diff changeset
226 tail = XCDR (tail);
d2c799f58129 Implement full support for frame-local `next-buffer' and `previous-buffer'.
Karoly Lorentey <lorentey@elte.hu>
parents: 83407
diff changeset
227 }
d2c799f58129 Implement full support for frame-local `next-buffer' and `previous-buffer'.
Karoly Lorentey <lorentey@elte.hu>
parents: 83407
diff changeset
228
d2c799f58129 Implement full support for frame-local `next-buffer' and `previous-buffer'.
Karoly Lorentey <lorentey@elte.hu>
parents: 83407
diff changeset
229 args[0] = framelist;
d2c799f58129 Implement full support for frame-local `next-buffer' and `previous-buffer'.
Karoly Lorentey <lorentey@elte.hu>
parents: 83407
diff changeset
230 args[1] = general;
d2c799f58129 Implement full support for frame-local `next-buffer' and `previous-buffer'.
Karoly Lorentey <lorentey@elte.hu>
parents: 83407
diff changeset
231 args[2] = prevlist;
d2c799f58129 Implement full support for frame-local `next-buffer' and `previous-buffer'.
Karoly Lorentey <lorentey@elte.hu>
parents: 83407
diff changeset
232 return Fnconc (3, args);
18455
9f5626727351 (Fbuffer_list): New optional argument FRAME.
Richard M. Stallman <rms@gnu.org>
parents: 18178
diff changeset
233 }
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 return general;
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
236 }
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
237
10210
43e95429ffa0 (Fget_buffer_create): Copy the name, and clear text props.
Richard M. Stallman <rms@gnu.org>
parents: 10146
diff changeset
238 /* 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
239 (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
240 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
241
43e95429ffa0 (Fget_buffer_create): Copy the name, and clear text props.
Richard M. Stallman <rms@gnu.org>
parents: 10146
diff changeset
242 static Lisp_Object
109144
7dceae91724c Convert most remaining function definitions to standard C.
Juanma Barranquero <lekktu@gmail.com>
parents: 109100
diff changeset
243 assoc_ignore_text_properties (register Lisp_Object key, Lisp_Object list)
10210
43e95429ffa0 (Fget_buffer_create): Copy the name, and clear text props.
Richard M. Stallman <rms@gnu.org>
parents: 10146
diff changeset
244 {
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 tail;
47972
287494c5e770 (assoc_ignore_text_properties, Fother_buffer, Fkill_buffer)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 46920
diff changeset
246 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
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 elt, tem;
47972
287494c5e770 (assoc_ignore_text_properties, Fother_buffer, Fkill_buffer)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 46920
diff changeset
249 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
250 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
251 if (!NILP (tem))
43e95429ffa0 (Fget_buffer_create): Copy the name, and clear text props.
Richard M. Stallman <rms@gnu.org>
parents: 10146
diff changeset
252 return elt;
43e95429ffa0 (Fget_buffer_create): Copy the name, and clear text props.
Richard M. Stallman <rms@gnu.org>
parents: 10146
diff changeset
253 }
43e95429ffa0 (Fget_buffer_create): Copy the name, and clear text props.
Richard M. Stallman <rms@gnu.org>
parents: 10146
diff changeset
254 return Qnil;
43e95429ffa0 (Fget_buffer_create): Copy the name, and clear text props.
Richard M. Stallman <rms@gnu.org>
parents: 10146
diff changeset
255 }
43e95429ffa0 (Fget_buffer_create): Copy the name, and clear text props.
Richard M. Stallman <rms@gnu.org>
parents: 10146
diff changeset
256
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
257 DEFUN ("get-buffer", Fget_buffer, Sget_buffer, 1, 1, 0,
98982
7ccc521ae6b1 (Fget_buffer, Fbury_buffer, switch_to_buffer_1):
Martin Rudalics <rudalics@gmx.at>
parents: 98732
diff changeset
258 doc: /* Return the buffer named BUFFER-OR-NAME.
7ccc521ae6b1 (Fget_buffer, Fbury_buffer, switch_to_buffer_1):
Martin Rudalics <rudalics@gmx.at>
parents: 98732
diff changeset
259 BUFFER-OR-NAME must be either a string or a buffer. If BUFFER-OR-NAME
7ccc521ae6b1 (Fget_buffer, Fbury_buffer, switch_to_buffer_1):
Martin Rudalics <rudalics@gmx.at>
parents: 98732
diff changeset
260 is a string and there is no buffer with that name, return nil. If
7ccc521ae6b1 (Fget_buffer, Fbury_buffer, switch_to_buffer_1):
Martin Rudalics <rudalics@gmx.at>
parents: 98732
diff changeset
261 BUFFER-OR-NAME is a buffer, return it as given. */)
109179
8cfee7d2955f Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109165
diff changeset
262 (register Lisp_Object buffer_or_name)
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
263 {
98982
7ccc521ae6b1 (Fget_buffer, Fbury_buffer, switch_to_buffer_1):
Martin Rudalics <rudalics@gmx.at>
parents: 98732
diff changeset
264 if (BUFFERP (buffer_or_name))
7ccc521ae6b1 (Fget_buffer, Fbury_buffer, switch_to_buffer_1):
Martin Rudalics <rudalics@gmx.at>
parents: 98732
diff changeset
265 return buffer_or_name;
7ccc521ae6b1 (Fget_buffer, Fbury_buffer, switch_to_buffer_1):
Martin Rudalics <rudalics@gmx.at>
parents: 98732
diff changeset
266 CHECK_STRING (buffer_or_name);
7ccc521ae6b1 (Fget_buffer, Fbury_buffer, switch_to_buffer_1):
Martin Rudalics <rudalics@gmx.at>
parents: 98732
diff changeset
267
7ccc521ae6b1 (Fget_buffer, Fbury_buffer, switch_to_buffer_1):
Martin Rudalics <rudalics@gmx.at>
parents: 98732
diff changeset
268 return Fcdr (assoc_ignore_text_properties (buffer_or_name, Vbuffer_alist));
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
269 }
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
270
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
271 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
272 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
273 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
274 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
275 See also `find-buffer-visiting'. */)
109179
8cfee7d2955f Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109165
diff changeset
276 (register Lisp_Object filename)
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
277 {
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
278 register Lisp_Object tail, buf, tem;
5433
7ac1e6f1565f Don't include syntax.h.
Richard M. Stallman <rms@gnu.org>
parents: 5247
diff changeset
279 Lisp_Object handler;
7ac1e6f1565f Don't include syntax.h.
Richard M. Stallman <rms@gnu.org>
parents: 5247
diff changeset
280
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40605
diff changeset
281 CHECK_STRING (filename);
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
282 filename = Fexpand_file_name (filename, Qnil);
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
283
5433
7ac1e6f1565f Don't include syntax.h.
Richard M. Stallman <rms@gnu.org>
parents: 5247
diff changeset
284 /* 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
285 call the corresponding file handler. */
7028
6915bf781a38 Pass operation to Ffind_file_name_handler.
Karl Heuer <kwzh@gnu.org>
parents: 6785
diff changeset
286 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
287 if (!NILP (handler))
7ac1e6f1565f Don't include syntax.h.
Richard M. Stallman <rms@gnu.org>
parents: 5247
diff changeset
288 return call2 (handler, Qget_file_buffer, filename);
7ac1e6f1565f Don't include syntax.h.
Richard M. Stallman <rms@gnu.org>
parents: 5247
diff changeset
289
26164
d39ec0a27081 more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents: 26088
diff changeset
290 for (tail = Vbuffer_alist; CONSP (tail); tail = XCDR (tail))
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
291 {
26164
d39ec0a27081 more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents: 26088
diff changeset
292 buf = Fcdr (XCAR (tail));
9146
8f966cc4652b (nsberror, Fget_buffer, Fget_file_buffer, Fbuffer_local_variables,
Karl Heuer <kwzh@gnu.org>
parents: 9047
diff changeset
293 if (!BUFFERP (buf)) continue;
8f966cc4652b (nsberror, Fget_buffer, Fget_file_buffer, Fbuffer_local_variables,
Karl Heuer <kwzh@gnu.org>
parents: 9047
diff changeset
294 if (!STRINGP (XBUFFER (buf)->filename)) continue;
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
295 tem = Fstring_equal (XBUFFER (buf)->filename, filename);
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 392
diff changeset
296 if (!NILP (tem))
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
297 return buf;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
298 }
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
299 return Qnil;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
300 }
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
301
12810
bd486675e103 (get_truename_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12785
diff changeset
302 Lisp_Object
109144
7dceae91724c Convert most remaining function definitions to standard C.
Juanma Barranquero <lekktu@gmail.com>
parents: 109100
diff changeset
303 get_truename_buffer (register Lisp_Object filename)
12810
bd486675e103 (get_truename_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12785
diff changeset
304 {
bd486675e103 (get_truename_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12785
diff changeset
305 register Lisp_Object tail, buf, tem;
bd486675e103 (get_truename_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12785
diff changeset
306
26164
d39ec0a27081 more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents: 26088
diff changeset
307 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
308 {
26164
d39ec0a27081 more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents: 26088
diff changeset
309 buf = Fcdr (XCAR (tail));
12810
bd486675e103 (get_truename_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12785
diff changeset
310 if (!BUFFERP (buf)) continue;
bd486675e103 (get_truename_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12785
diff changeset
311 if (!STRINGP (XBUFFER (buf)->file_truename)) continue;
bd486675e103 (get_truename_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12785
diff changeset
312 tem = Fstring_equal (XBUFFER (buf)->file_truename, filename);
bd486675e103 (get_truename_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12785
diff changeset
313 if (!NILP (tem))
bd486675e103 (get_truename_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12785
diff changeset
314 return buf;
bd486675e103 (get_truename_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12785
diff changeset
315 }
bd486675e103 (get_truename_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12785
diff changeset
316 return Qnil;
bd486675e103 (get_truename_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12785
diff changeset
317 }
bd486675e103 (get_truename_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12785
diff changeset
318
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
319 /* Incremented for each buffer created, to assign the buffer number. */
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
320 int buffer_count;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
321
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
322 DEFUN ("get-buffer-create", Fget_buffer_create, Sget_buffer_create, 1, 1, 0,
99080
ccaba4c89996 (Fget_buffer_create): Rename arg to buffer_or_name. Reword doc-string.
Martin Rudalics <rudalics@gmx.at>
parents: 98982
diff changeset
323 doc: /* Return the buffer specified by BUFFER-OR-NAME, creating a new one if needed.
ccaba4c89996 (Fget_buffer_create): Rename arg to buffer_or_name. Reword doc-string.
Martin Rudalics <rudalics@gmx.at>
parents: 98982
diff changeset
324 If BUFFER-OR-NAME is a string and a live buffer with that name exists,
ccaba4c89996 (Fget_buffer_create): Rename arg to buffer_or_name. Reword doc-string.
Martin Rudalics <rudalics@gmx.at>
parents: 98982
diff changeset
325 return that buffer. If no such buffer exists, create a new buffer with
ccaba4c89996 (Fget_buffer_create): Rename arg to buffer_or_name. Reword doc-string.
Martin Rudalics <rudalics@gmx.at>
parents: 98982
diff changeset
326 that name and return it. If BUFFER-OR-NAME starts with a space, the new
ccaba4c89996 (Fget_buffer_create): Rename arg to buffer_or_name. Reword doc-string.
Martin Rudalics <rudalics@gmx.at>
parents: 98982
diff changeset
327 buffer does not keep undo information.
ccaba4c89996 (Fget_buffer_create): Rename arg to buffer_or_name. Reword doc-string.
Martin Rudalics <rudalics@gmx.at>
parents: 98982
diff changeset
328
ccaba4c89996 (Fget_buffer_create): Rename arg to buffer_or_name. Reword doc-string.
Martin Rudalics <rudalics@gmx.at>
parents: 98982
diff changeset
329 If BUFFER-OR-NAME is a buffer instead of a string, return it as given,
ccaba4c89996 (Fget_buffer_create): Rename arg to buffer_or_name. Reword doc-string.
Martin Rudalics <rudalics@gmx.at>
parents: 98982
diff changeset
330 even if it is dead. The return value is never nil. */)
109179
8cfee7d2955f Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109165
diff changeset
331 (register Lisp_Object buffer_or_name)
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
332 {
99080
ccaba4c89996 (Fget_buffer_create): Rename arg to buffer_or_name. Reword doc-string.
Martin Rudalics <rudalics@gmx.at>
parents: 98982
diff changeset
333 register Lisp_Object buffer, name;
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
334 register struct buffer *b;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
335
99080
ccaba4c89996 (Fget_buffer_create): Rename arg to buffer_or_name. Reword doc-string.
Martin Rudalics <rudalics@gmx.at>
parents: 98982
diff changeset
336 buffer = Fget_buffer (buffer_or_name);
ccaba4c89996 (Fget_buffer_create): Rename arg to buffer_or_name. Reword doc-string.
Martin Rudalics <rudalics@gmx.at>
parents: 98982
diff changeset
337 if (!NILP (buffer))
ccaba4c89996 (Fget_buffer_create): Rename arg to buffer_or_name. Reword doc-string.
Martin Rudalics <rudalics@gmx.at>
parents: 98982
diff changeset
338 return buffer;
ccaba4c89996 (Fget_buffer_create): Rename arg to buffer_or_name. Reword doc-string.
Martin Rudalics <rudalics@gmx.at>
parents: 98982
diff changeset
339
ccaba4c89996 (Fget_buffer_create): Rename arg to buffer_or_name. Reword doc-string.
Martin Rudalics <rudalics@gmx.at>
parents: 98982
diff changeset
340 if (SCHARS (buffer_or_name) == 0)
6697
28e36f59e856 (Fget_buffer_create): Disallow empty string.
Karl Heuer <kwzh@gnu.org>
parents: 6675
diff changeset
341 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
342
86561
13041217da4b (Fget_buffer_create, Fmake_indirect_buffer): Don't cast redundantly.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 86285
diff changeset
343 b = allocate_buffer ();
10314
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
344
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
345 /* 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
346 b->text = &b->own_text;
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
347 b->base_buffer = 0;
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
348
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
349 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
350 BLOCK_INPUT;
17022
907fb167f7de Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16840
diff changeset
351 /* 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
352 anchoring a search. */
31604
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
353 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
354 UNBLOCK_INPUT;
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
355 if (! BUF_BEG_ADDR (b))
10668
acbd9fab366a (Fget_buffer_create): Call buffer_memory_full.
Richard M. Stallman <rms@gnu.org>
parents: 10611
diff changeset
356 buffer_memory_full ();
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
357
47972
287494c5e770 (assoc_ignore_text_properties, Fother_buffer, Fkill_buffer)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 46920
diff changeset
358 BUF_PT (b) = BEG;
287494c5e770 (assoc_ignore_text_properties, Fother_buffer, Fkill_buffer)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 46920
diff changeset
359 BUF_GPT (b) = BEG;
287494c5e770 (assoc_ignore_text_properties, Fother_buffer, Fkill_buffer)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 46920
diff changeset
360 BUF_BEGV (b) = BEG;
287494c5e770 (assoc_ignore_text_properties, Fother_buffer, Fkill_buffer)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 46920
diff changeset
361 BUF_ZV (b) = BEG;
287494c5e770 (assoc_ignore_text_properties, Fother_buffer, Fkill_buffer)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 46920
diff changeset
362 BUF_Z (b) = BEG;
287494c5e770 (assoc_ignore_text_properties, Fother_buffer, Fkill_buffer)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 46920
diff changeset
363 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
364 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
365 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
366 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
367 BUF_Z_BYTE (b) = BEG_BYTE;
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
368 BUF_MODIFF (b) = 1;
72592
f6de516bbb4b * buffer.h (struct buffer_text): New field chars_modiff.
Chong Yidong <cyd@stupidchicken.com>
parents: 72532
diff changeset
369 BUF_CHARS_MODIFF (b) = 1;
16213
3b8851bebc76 (Fget_buffer_create): Initialize BUF_OVERLAY_MODIFF.
Richard M. Stallman <rms@gnu.org>
parents: 16193
diff changeset
370 BUF_OVERLAY_MODIFF (b) = 1;
10314
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
371 BUF_SAVE_MODIFF (b) = 1;
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
372 BUF_INTERVALS (b) = 0;
25368
f9949db6ca7d (set_buffer_internal): Set windows_or_buffers_changed
Gerd Moellmann <gerd@gnu.org>
parents: 25351
diff changeset
373 BUF_UNCHANGED_MODIFIED (b) = 1;
f9949db6ca7d (set_buffer_internal): Set windows_or_buffers_changed
Gerd Moellmann <gerd@gnu.org>
parents: 25351
diff changeset
374 BUF_OVERLAY_UNCHANGED_MODIFIED (b) = 1;
f9949db6ca7d (set_buffer_internal): Set windows_or_buffers_changed
Gerd Moellmann <gerd@gnu.org>
parents: 25351
diff changeset
375 BUF_END_UNCHANGED (b) = 0;
f9949db6ca7d (set_buffer_internal): Set windows_or_buffers_changed
Gerd Moellmann <gerd@gnu.org>
parents: 25351
diff changeset
376 BUF_BEG_UNCHANGED (b) = 0;
17022
907fb167f7de Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16840
diff changeset
377 *(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
378
9403
9f797989b817 * buffer.c: #include region-cache.h.
Jim Blandy <jimb@redhat.com>
parents: 9362
diff changeset
379 b->newline_cache = 0;
9f797989b817 * buffer.c: #include region-cache.h.
Jim Blandy <jimb@redhat.com>
parents: 9362
diff changeset
380 b->width_run_cache = 0;
9f797989b817 * buffer.c: #include region-cache.h.
Jim Blandy <jimb@redhat.com>
parents: 9362
diff changeset
381 b->width_table = Qnil;
25368
f9949db6ca7d (set_buffer_internal): Set windows_or_buffers_changed
Gerd Moellmann <gerd@gnu.org>
parents: 25351
diff changeset
382 b->prevent_redisplay_optimizations_p = 1;
9403
9f797989b817 * buffer.c: #include region-cache.h.
Jim Blandy <jimb@redhat.com>
parents: 9362
diff changeset
383
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
384 /* Put this on the chain of all buffers including killed ones. */
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
385 b->next = all_buffers;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
386 all_buffers = b;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
387
10314
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
388 /* An ordinary buffer normally doesn't need markers
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
389 to handle BEGV and ZV. */
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
390 b->pt_marker = Qnil;
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
391 b->begv_marker = Qnil;
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
392 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
393
99080
ccaba4c89996 (Fget_buffer_create): Rename arg to buffer_or_name. Reword doc-string.
Martin Rudalics <rudalics@gmx.at>
parents: 98982
diff changeset
394 name = Fcopy_sequence (buffer_or_name);
46378
ef7dc46ecd0b * buffer.c (Fget_buffer_create, Fmake_indirect_buffer): Use it.
Ken Raeburn <raeburn@raeburn.org>
parents: 46370
diff changeset
395 STRING_SET_INTERVALS (name, NULL_INTERVAL);
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
396 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
397
85328
d0d527210b0c * lisp.h (enum Lisp_Misc_Type): Del Lisp_Misc_Some_Buffer_Local_Value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 85296
diff changeset
398 b->undo_list = (SREF (name, 0) != ' ') ? Qnil : Qt;
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
399
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
400 reset_buffer (b);
15776
6018e01d4466 (buffer_permanent_local_flags): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 15638
diff changeset
401 reset_buffer_local_variables (b, 1);
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
402
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
403 b->mark = Fmake_marker ();
51669
f3dc77591fe2 (set_buffer_internal_1): Test CONSP for lists.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51431
diff changeset
404 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
405 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
406
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
407 /* Put this in the alist of all live buffers. */
99080
ccaba4c89996 (Fget_buffer_create): Rename arg to buffer_or_name. Reword doc-string.
Martin Rudalics <rudalics@gmx.at>
parents: 98982
diff changeset
408 XSETBUFFER (buffer, b);
ccaba4c89996 (Fget_buffer_create): Rename arg to buffer_or_name. Reword doc-string.
Martin Rudalics <rudalics@gmx.at>
parents: 98982
diff changeset
409 Vbuffer_alist = nconc2 (Vbuffer_alist, Fcons (Fcons (name, buffer), Qnil));
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
410
75784
ea846c2df7e0 Reflow docstrings.
Juanma Barranquero <lekktu@gmail.com>
parents: 75348
diff changeset
411 /* An error in calling the function here (should someone redefine it)
51318
0b5248964d32 Comment.
Dave Love <fx@gnu.org>
parents: 51255
diff changeset
412 can lead to infinite regress until you run out of stack. rms
0b5248964d32 Comment.
Dave Love <fx@gnu.org>
parents: 51255
diff changeset
413 says that's not worth protecting against. */
48635
2a9a1d761581 (Qucs_set_table_for_input): New.
Dave Love <fx@gnu.org>
parents: 48355
diff changeset
414 if (!NILP (Ffboundp (Qucs_set_table_for_input)))
99080
ccaba4c89996 (Fget_buffer_create): Rename arg to buffer_or_name. Reword doc-string.
Martin Rudalics <rudalics@gmx.at>
parents: 98982
diff changeset
415 /* buffer is on buffer-alist, so no gcpro. */
ccaba4c89996 (Fget_buffer_create): Rename arg to buffer_or_name. Reword doc-string.
Martin Rudalics <rudalics@gmx.at>
parents: 98982
diff changeset
416 call1 (Qucs_set_table_for_input, buffer);
ccaba4c89996 (Fget_buffer_create): Rename arg to buffer_or_name. Reword doc-string.
Martin Rudalics <rudalics@gmx.at>
parents: 98982
diff changeset
417
ccaba4c89996 (Fget_buffer_create): Rename arg to buffer_or_name. Reword doc-string.
Martin Rudalics <rudalics@gmx.at>
parents: 98982
diff changeset
418 return buffer;
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
419 }
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
420
28625
5d68443d3df1 (clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28518
diff changeset
421
37752
1085e1cfebaf (copy_overlays): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 37463
diff changeset
422 /* 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
423 LIST, but for buffer B. */
1085e1cfebaf (copy_overlays): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 37463
diff changeset
424
51844
c5036e7cc93b (overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51827
diff changeset
425 static struct Lisp_Overlay *
109144
7dceae91724c Convert most remaining function definitions to standard C.
Juanma Barranquero <lekktu@gmail.com>
parents: 109100
diff changeset
426 copy_overlays (struct buffer *b, struct Lisp_Overlay *list)
37752
1085e1cfebaf (copy_overlays): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 37463
diff changeset
427 {
51844
c5036e7cc93b (overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51827
diff changeset
428 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
429 struct Lisp_Overlay *result = NULL, *tail = NULL;
37752
1085e1cfebaf (copy_overlays): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 37463
diff changeset
430
1085e1cfebaf (copy_overlays): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 37463
diff changeset
431 XSETBUFFER (buffer, b);
1085e1cfebaf (copy_overlays): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 37463
diff changeset
432
51844
c5036e7cc93b (overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51827
diff changeset
433 for (; list; list = list->next)
37752
1085e1cfebaf (copy_overlays): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 37463
diff changeset
434 {
1085e1cfebaf (copy_overlays): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 37463
diff changeset
435 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
436 EMACS_INT charpos;
37752
1085e1cfebaf (copy_overlays): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 37463
diff changeset
437
51844
c5036e7cc93b (overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51827
diff changeset
438 XSETMISC (old_overlay, list);
37752
1085e1cfebaf (copy_overlays): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 37463
diff changeset
439 charpos = marker_position (OVERLAY_START (old_overlay));
1085e1cfebaf (copy_overlays): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 37463
diff changeset
440 start = Fmake_marker ();
37950
f01f454ea6bf (copy_overlays): Make ENABLE_CHECKING happy.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 37752
diff changeset
441 Fset_marker (start, make_number (charpos), buffer);
37752
1085e1cfebaf (copy_overlays): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 37463
diff changeset
442 XMARKER (start)->insertion_type
1085e1cfebaf (copy_overlays): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 37463
diff changeset
443 = XMARKER (OVERLAY_START (old_overlay))->insertion_type;
1085e1cfebaf (copy_overlays): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 37463
diff changeset
444
1085e1cfebaf (copy_overlays): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 37463
diff changeset
445 charpos = marker_position (OVERLAY_END (old_overlay));
1085e1cfebaf (copy_overlays): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 37463
diff changeset
446 end = Fmake_marker ();
37950
f01f454ea6bf (copy_overlays): Make ENABLE_CHECKING happy.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 37752
diff changeset
447 Fset_marker (end, make_number (charpos), buffer);
37752
1085e1cfebaf (copy_overlays): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 37463
diff changeset
448 XMARKER (end)->insertion_type
1085e1cfebaf (copy_overlays): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 37463
diff changeset
449 = XMARKER (OVERLAY_END (old_overlay))->insertion_type;
1085e1cfebaf (copy_overlays): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 37463
diff changeset
450
1085e1cfebaf (copy_overlays): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 37463
diff changeset
451 overlay = allocate_misc ();
1085e1cfebaf (copy_overlays): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 37463
diff changeset
452 XMISCTYPE (overlay) = Lisp_Misc_Overlay;
1085e1cfebaf (copy_overlays): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 37463
diff changeset
453 OVERLAY_START (overlay) = start;
1085e1cfebaf (copy_overlays): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 37463
diff changeset
454 OVERLAY_END (overlay) = end;
1085e1cfebaf (copy_overlays): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 37463
diff changeset
455 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
456 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
457
c5036e7cc93b (overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51827
diff changeset
458 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
459 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
460 else
c5036e7cc93b (overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51827
diff changeset
461 result = tail = XOVERLAY (overlay);
37752
1085e1cfebaf (copy_overlays): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 37463
diff changeset
462 }
1085e1cfebaf (copy_overlays): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 37463
diff changeset
463
51844
c5036e7cc93b (overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51827
diff changeset
464 return result;
37752
1085e1cfebaf (copy_overlays): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 37463
diff changeset
465 }
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49444
diff changeset
466
37752
1085e1cfebaf (copy_overlays): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 37463
diff changeset
467
28625
5d68443d3df1 (clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28518
diff changeset
468 /* Clone per-buffer values of buffer FROM.
5d68443d3df1 (clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28518
diff changeset
469
5d68443d3df1 (clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28518
diff changeset
470 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
471 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
472 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
473 copied. */
5d68443d3df1 (clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28518
diff changeset
474
5d68443d3df1 (clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28518
diff changeset
475 static void
109144
7dceae91724c Convert most remaining function definitions to standard C.
Juanma Barranquero <lekktu@gmail.com>
parents: 109100
diff changeset
476 clone_per_buffer_values (struct buffer *from, struct buffer *to)
28625
5d68443d3df1 (clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28518
diff changeset
477 {
66233
e93aafd2c52b (clone_per_buffer_values): Remove unused var tem.
Kim F. Storm <storm@cua.dk>
parents: 66043
diff changeset
478 Lisp_Object to_buffer;
28625
5d68443d3df1 (clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28518
diff changeset
479 int offset;
5d68443d3df1 (clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28518
diff changeset
480
5d68443d3df1 (clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28518
diff changeset
481 XSETBUFFER (to_buffer, to);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49444
diff changeset
482
91781
a6047ef14f4c (clone_per_buffer_values, reset_buffer_local_variables)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 91711
diff changeset
483 /* buffer-local Lisp variables start at `undo_list',
a6047ef14f4c (clone_per_buffer_values, reset_buffer_local_variables)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 91711
diff changeset
484 tho only the ones from `name' on are GC'd normally. */
95826
54e76878a8c0 (clone_per_buffer_values): Skip `name'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95590
diff changeset
485 for (offset = PER_BUFFER_VAR_OFFSET (undo_list);
28625
5d68443d3df1 (clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28518
diff changeset
486 offset < sizeof *to;
5d68443d3df1 (clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28518
diff changeset
487 offset += sizeof (Lisp_Object))
5d68443d3df1 (clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28518
diff changeset
488 {
5d68443d3df1 (clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28518
diff changeset
489 Lisp_Object obj;
5d68443d3df1 (clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28518
diff changeset
490
95826
54e76878a8c0 (clone_per_buffer_values): Skip `name'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95590
diff changeset
491 /* Don't touch the `name' which should be unique for every buffer. */
54e76878a8c0 (clone_per_buffer_values): Skip `name'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95590
diff changeset
492 if (offset == PER_BUFFER_VAR_OFFSET (name))
54e76878a8c0 (clone_per_buffer_values): Skip `name'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95590
diff changeset
493 continue;
54e76878a8c0 (clone_per_buffer_values): Skip `name'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95590
diff changeset
494
28625
5d68443d3df1 (clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28518
diff changeset
495 obj = PER_BUFFER_VALUE (from, offset);
107984
bef5d1738c0b Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 107845
diff changeset
496 if (MARKERP (obj) && XMARKER (obj)->buffer == from)
28625
5d68443d3df1 (clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28518
diff changeset
497 {
5d68443d3df1 (clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28518
diff changeset
498 struct Lisp_Marker *m = XMARKER (obj);
5d68443d3df1 (clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28518
diff changeset
499 obj = Fmake_marker ();
5d68443d3df1 (clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28518
diff changeset
500 XMARKER (obj)->insertion_type = m->insertion_type;
5d68443d3df1 (clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28518
diff changeset
501 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
502 }
5d68443d3df1 (clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28518
diff changeset
503
5d68443d3df1 (clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28518
diff changeset
504 PER_BUFFER_VALUE (to, offset) = obj;
5d68443d3df1 (clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28518
diff changeset
505 }
5d68443d3df1 (clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28518
diff changeset
506
109165
750db9f3e6d8 Replace bcopy, bzero, bcmp by memcpy, memmove, memset, memcmp
Andreas Schwab <schwab@linux-m68k.org>
parents: 109144
diff changeset
507 memcpy (to->local_flags, from->local_flags, sizeof to->local_flags);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49444
diff changeset
508
37752
1085e1cfebaf (copy_overlays): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 37463
diff changeset
509 to->overlays_before = copy_overlays (to, from->overlays_before);
1085e1cfebaf (copy_overlays): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 37463
diff changeset
510 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
511
60683
d2f6fa8790f3 (buffer_lisp_local_variables): New function,
Richard M. Stallman <rms@gnu.org>
parents: 60248
diff changeset
512 /* 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
513 and install that in TO. */
d2f6fa8790f3 (buffer_lisp_local_variables): New function,
Richard M. Stallman <rms@gnu.org>
parents: 60248
diff changeset
514 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
515 }
5d68443d3df1 (clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28518
diff changeset
516
5d68443d3df1 (clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28518
diff changeset
517 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
518 2, 3,
11838
92a61e91ec05 (Fmake_indirect_buffer): Fix interactive spec.
Karl Heuer <kwzh@gnu.org>
parents: 11823
diff changeset
519 "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
520 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
521 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
522 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
523 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
524 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
525 CLONE nil means the indirect buffer's state is reset to default values. */)
109179
8cfee7d2955f Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109165
diff changeset
526 (Lisp_Object base_buffer, Lisp_Object name, Lisp_Object clone)
10314
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
527 {
54834
9533e29b87e8 (Fmake_indirect_buffer): Throw an error if the intended base buffer
Luc Teirlinck <teirllm@auburn.edu>
parents: 54819
diff changeset
528 Lisp_Object buf, tem;
28625
5d68443d3df1 (clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28518
diff changeset
529 struct buffer *b;
10314
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
530
54819
8df5ed349fc2 (Fmake_indirect_buffer): Check that NAME is a string.
Andreas Schwab <schwab@suse.de>
parents: 54786
diff changeset
531 CHECK_STRING (name);
10314
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
532 buf = Fget_buffer (name);
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
533 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
534 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
535
54834
9533e29b87e8 (Fmake_indirect_buffer): Throw an error if the intended base buffer
Luc Teirlinck <teirllm@auburn.edu>
parents: 54819
diff changeset
536 tem = base_buffer;
10314
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
537 base_buffer = Fget_buffer (base_buffer);
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
538 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
539 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
540 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
541 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
542
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46293
diff changeset
543 if (SCHARS (name) == 0)
10314
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
544 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
545
86561
13041217da4b (Fget_buffer_create, Fmake_indirect_buffer): Don't cast redundantly.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 86285
diff changeset
546 b = allocate_buffer ();
85328
d0d527210b0c * lisp.h (enum Lisp_Misc_Type): Del Lisp_Misc_Some_Buffer_Local_Value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 85296
diff changeset
547
d0d527210b0c * lisp.h (enum Lisp_Misc_Type): Del Lisp_Misc_Some_Buffer_Local_Value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 85296
diff changeset
548 b->base_buffer = (XBUFFER (base_buffer)->base_buffer
d0d527210b0c * lisp.h (enum Lisp_Misc_Type): Del Lisp_Misc_Some_Buffer_Local_Value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 85296
diff changeset
549 ? XBUFFER (base_buffer)->base_buffer
d0d527210b0c * lisp.h (enum Lisp_Misc_Type): Del Lisp_Misc_Some_Buffer_Local_Value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 85296
diff changeset
550 : XBUFFER (base_buffer));
10314
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
551
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
552 /* Use the base buffer's text object. */
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
553 b->text = b->base_buffer->text;
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
554
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
555 BUF_BEGV (b) = BUF_BEGV (b->base_buffer);
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
556 BUF_ZV (b) = BUF_ZV (b->base_buffer);
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
557 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
558 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
559 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
560 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
561
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
562 b->newline_cache = 0;
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
563 b->width_run_cache = 0;
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
564 b->width_table = Qnil;
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
565
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
566 /* 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
567 b->next = all_buffers;
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
568 all_buffers = b;
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
569
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
570 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
571 STRING_SET_INTERVALS (name, NULL_INTERVAL);
10314
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
572 b->name = name;
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
573
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
574 reset_buffer (b);
15776
6018e01d4466 (buffer_permanent_local_flags): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 15638
diff changeset
575 reset_buffer_local_variables (b, 1);
10314
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
576
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
577 /* 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
578 XSETBUFFER (buf, b);
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
579 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
580
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
581 b->mark = Fmake_marker ();
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
582 b->name = name;
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
583
24604
a9eb0deae6c0 (Fmake_indirect_buffer): Copy multibyte status from the base buffer.
Richard M. Stallman <rms@gnu.org>
parents: 24520
diff changeset
584 /* 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
585 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
586
10314
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
587 /* 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
588 if (NILP (b->base_buffer->pt_marker))
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
589 {
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
590 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
591 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
592 BUF_PT (b->base_buffer),
b964f3facafa (Fmake_indirect_buffer): Use set_marker_both.
Richard M. Stallman <rms@gnu.org>
parents: 20368
diff changeset
593 BUF_PT_BYTE (b->base_buffer));
10314
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
594 }
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
595 if (NILP (b->base_buffer->begv_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->begv_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->begv_marker, base_buffer,
b964f3facafa (Fmake_indirect_buffer): Use set_marker_both.
Richard M. Stallman <rms@gnu.org>
parents: 20368
diff changeset
599 BUF_BEGV (b->base_buffer),
b964f3facafa (Fmake_indirect_buffer): Use set_marker_both.
Richard M. Stallman <rms@gnu.org>
parents: 20368
diff changeset
600 BUF_BEGV_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->zv_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->zv_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->zv_marker, base_buffer,
b964f3facafa (Fmake_indirect_buffer): Use set_marker_both.
Richard M. Stallman <rms@gnu.org>
parents: 20368
diff changeset
606 BUF_ZV (b->base_buffer),
b964f3facafa (Fmake_indirect_buffer): Use set_marker_both.
Richard M. Stallman <rms@gnu.org>
parents: 20368
diff changeset
607 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
608 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
609 }
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
610
28625
5d68443d3df1 (clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28518
diff changeset
611 if (NILP (clone))
5d68443d3df1 (clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28518
diff changeset
612 {
5d68443d3df1 (clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28518
diff changeset
613 /* Give the indirect buffer markers for its narrowing. */
5d68443d3df1 (clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28518
diff changeset
614 b->pt_marker = Fmake_marker ();
5d68443d3df1 (clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28518
diff changeset
615 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
616 b->begv_marker = Fmake_marker ();
5d68443d3df1 (clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28518
diff changeset
617 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
618 b->zv_marker = Fmake_marker ();
5d68443d3df1 (clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28518
diff changeset
619 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
620 XMARKER (b->zv_marker)->insertion_type = 1;
5d68443d3df1 (clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28518
diff changeset
621 }
5d68443d3df1 (clone_per_buffer_values): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28518
diff changeset
622 else
61445
9ee6093ffeaf (Fmake_indirect_buffer): Clear out some local variables.
Richard M. Stallman <rms@gnu.org>
parents: 60683
diff changeset
623 {
9ee6093ffeaf (Fmake_indirect_buffer): Clear out some local variables.
Richard M. Stallman <rms@gnu.org>
parents: 60683
diff changeset
624 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
625
9ee6093ffeaf (Fmake_indirect_buffer): Clear out some local variables.
Richard M. Stallman <rms@gnu.org>
parents: 60683
diff changeset
626 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
627 b->filename = Qnil;
9ee6093ffeaf (Fmake_indirect_buffer): Clear out some local variables.
Richard M. Stallman <rms@gnu.org>
parents: 60683
diff changeset
628 b->file_truename = Qnil;
9ee6093ffeaf (Fmake_indirect_buffer): Clear out some local variables.
Richard M. Stallman <rms@gnu.org>
parents: 60683
diff changeset
629 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
630 b->backed_up = Qnil;
9ee6093ffeaf (Fmake_indirect_buffer): Clear out some local variables.
Richard M. Stallman <rms@gnu.org>
parents: 60683
diff changeset
631 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
632 set_buffer_internal_1 (b);
9ee6093ffeaf (Fmake_indirect_buffer): Clear out some local variables.
Richard M. Stallman <rms@gnu.org>
parents: 60683
diff changeset
633 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
634 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
635 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
636 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
637 }
10314
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
638
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
639 return buf;
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
640 }
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
641
52012
d116f572d76b (delete_all_overlays): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51939
diff changeset
642 void
109144
7dceae91724c Convert most remaining function definitions to standard C.
Juanma Barranquero <lekktu@gmail.com>
parents: 109100
diff changeset
643 delete_all_overlays (struct buffer *b)
52012
d116f572d76b (delete_all_overlays): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51939
diff changeset
644 {
d116f572d76b (delete_all_overlays): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51939
diff changeset
645 Lisp_Object overlay;
d116f572d76b (delete_all_overlays): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51939
diff changeset
646
d116f572d76b (delete_all_overlays): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51939
diff changeset
647 /* `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
648 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
649 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
650 them any more. */
d116f572d76b (delete_all_overlays): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51939
diff changeset
651 while (b->overlays_before)
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 XSETMISC (overlay, b->overlays_before);
d116f572d76b (delete_all_overlays): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51939
diff changeset
654 Fdelete_overlay (overlay);
d116f572d76b (delete_all_overlays): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51939
diff changeset
655 }
d116f572d76b (delete_all_overlays): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51939
diff changeset
656 while (b->overlays_after)
d116f572d76b (delete_all_overlays): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51939
diff changeset
657 {
d116f572d76b (delete_all_overlays): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51939
diff changeset
658 XSETMISC (overlay, b->overlays_after);
d116f572d76b (delete_all_overlays): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51939
diff changeset
659 Fdelete_overlay (overlay);
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 eassert (b->overlays_before == NULL);
d116f572d76b (delete_all_overlays): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51939
diff changeset
662 eassert (b->overlays_after == NULL);
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
8873
b58ea8cae183 (reset_buffer): Don't call reset_buffer_local_variables.
Richard M. Stallman <rms@gnu.org>
parents: 8839
diff changeset
665 /* 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
666 and local variables.
52012
d116f572d76b (delete_all_overlays): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51939
diff changeset
667 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
668 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
669 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
670 claims it doesn't belong to it. */
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
671
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
672 void
109144
7dceae91724c Convert most remaining function definitions to standard C.
Juanma Barranquero <lekktu@gmail.com>
parents: 109100
diff changeset
673 reset_buffer (register struct buffer *b)
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
674 {
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
675 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
676 b->file_truename = Qnil;
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
677 b->directory = (current_buffer) ? current_buffer->directory : Qnil;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
678 b->modtime = 0;
107845
688679bd79f5 Try to detect file modification within the same second.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 107737
diff changeset
679 b->modtime_size = -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
680 XSETFASTINT (b->save_length, 0);
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
681 b->last_window_start = 1;
17566
7ed40081342f (reset_buffer): Initialize clip_changed field.
Richard M. Stallman <rms@gnu.org>
parents: 17238
diff changeset
682 /* 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
683 b->clip_changed = 0;
f9949db6ca7d (set_buffer_internal): Set windows_or_buffers_changed
Gerd Moellmann <gerd@gnu.org>
parents: 25351
diff changeset
684 b->prevent_redisplay_optimizations_p = 1;
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
685 b->backed_up = Qnil;
106813
4040ecb0c904 Try to fix bug#5314. This is probably not the final word, tho.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106185
diff changeset
686 BUF_AUTOSAVE_MODIFF (b) = 0;
6477
95a4c1f81d0c (reset_buffer): Init auto_save_failure_time slot.
Richard M. Stallman <rms@gnu.org>
parents: 6348
diff changeset
687 b->auto_save_failure_time = -1;
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
688 b->auto_save_file_name = Qnil;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
689 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
690 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
691 b->overlays_after = NULL;
51824
9f5665eb77bd (reset_buffer, recenter_overlay_lists)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51782
diff changeset
692 b->overlay_center = BEG;
3242
f873e6b9af52 (reset_buffer): Clear mark_active field here.
Richard M. Stallman <rms@gnu.org>
parents: 3226
diff changeset
693 b->mark_active = Qnil;
10561
53f34c870201 (init_buffer_once, syms_of_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 10505
diff changeset
694 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
695 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
696 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
697 b->last_selected_window = Qnil;
17218
a57ca25e9c62 (reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents: 17124
diff changeset
698 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
699 b->display_time = Qnil;
20995
abc60038dd2b (syms_of_buffer): enable-multibyte-characters is read-only.
Karl Heuer <kwzh@gnu.org>
parents: 20935
diff changeset
700 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
701 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
702 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
703
11a505aa1322 (reset_buffer): Initialize `display_error_modiff'.
Richard M. Stallman <rms@gnu.org>
parents: 41524
diff changeset
704 b->display_error_modiff = 0;
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
705 }
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
706
8873
b58ea8cae183 (reset_buffer): Don't call reset_buffer_local_variables.
Richard M. Stallman <rms@gnu.org>
parents: 8839
diff changeset
707 /* 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
708 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
709 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
710 Instead, use Fkill_all_local_variables.
6018e01d4466 (buffer_permanent_local_flags): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 15638
diff changeset
711
87218
409f76c92cb2 (reset_buffer_local_variables): If permanent_too is 0, also
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 87215
diff changeset
712 If PERMANENT_TOO is 1, then we reset permanent
15776
6018e01d4466 (buffer_permanent_local_flags): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 15638
diff changeset
713 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
714 we preserve those. */
6018e01d4466 (buffer_permanent_local_flags): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 15638
diff changeset
715
6018e01d4466 (buffer_permanent_local_flags): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 15638
diff changeset
716 static void
109144
7dceae91724c Convert most remaining function definitions to standard C.
Juanma Barranquero <lekktu@gmail.com>
parents: 109100
diff changeset
717 reset_buffer_local_variables (register struct buffer *b, int permanent_too)
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
718 {
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
719 register int offset;
28314
c46e609d887a (buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents: 28207
diff changeset
720 int i;
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
721
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
722 /* Reset the major mode to Fundamental, together with all the
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
723 things that depend on the major mode.
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
724 default-major-mode is handled at a higher level.
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
725 We ignore it here. */
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
726 b->major_mode = Qfundamental_mode;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
727 b->keymap = Qnil;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
728 b->mode_name = QSFundamental;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
729 b->minor_modes = Qnil;
13270
76e69b0af94d (reset_buffer_local_variables): Call
Richard M. Stallman <rms@gnu.org>
parents: 13263
diff changeset
730
76e69b0af94d (reset_buffer_local_variables): Call
Richard M. Stallman <rms@gnu.org>
parents: 13263
diff changeset
731 /* 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
732 fix up its insides first. */
76e69b0af94d (reset_buffer_local_variables): Call
Richard M. Stallman <rms@gnu.org>
parents: 13263
diff changeset
733 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
734 && 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
735 && 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
736 Fset_standard_case_table (Vascii_downcase_table);
76e69b0af94d (reset_buffer_local_variables): Call
Richard M. Stallman <rms@gnu.org>
parents: 13263
diff changeset
737
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
738 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
739 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
740 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
741 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
742 b->invisibility_spec = Qt;
15786
f2d0e8928d57 (buffer_permanent_local_flags): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 15776
diff changeset
743 #ifndef DOS_NT
f2d0e8928d57 (buffer_permanent_local_flags): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 15776
diff changeset
744 b->buffer_file_type = Qnil;
f2d0e8928d57 (buffer_permanent_local_flags): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 15776
diff changeset
745 #endif
10967
b53b84b6f46d (reset_buffer_local_variables): Init invisibility.
Richard M. Stallman <rms@gnu.org>
parents: 10916
diff changeset
746
15776
6018e01d4466 (buffer_permanent_local_flags): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 15638
diff changeset
747 /* Reset all (or most) per-buffer variables to their defaults. */
87218
409f76c92cb2 (reset_buffer_local_variables): If permanent_too is 0, also
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 87215
diff changeset
748 if (permanent_too)
409f76c92cb2 (reset_buffer_local_variables): If permanent_too is 0, also
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 87215
diff changeset
749 b->local_var_alist = Qnil;
409f76c92cb2 (reset_buffer_local_variables): If permanent_too is 0, also
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 87215
diff changeset
750 else
409f76c92cb2 (reset_buffer_local_variables): If permanent_too is 0, also
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 87215
diff changeset
751 {
87977
0f04103be3bf (reset_buffer_local_variables): Implement `permanent-local-hook'.
Richard M. Stallman <rms@gnu.org>
parents: 87843
diff changeset
752 Lisp_Object tmp, prop, last = Qnil;
87218
409f76c92cb2 (reset_buffer_local_variables): If permanent_too is 0, also
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 87215
diff changeset
753 for (tmp = b->local_var_alist; CONSP (tmp); tmp = XCDR (tmp))
107984
bef5d1738c0b Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 107845
diff changeset
754 if (!NILP (prop = Fget (XCAR (XCAR (tmp)), Qpermanent_local)))
87977
0f04103be3bf (reset_buffer_local_variables): Implement `permanent-local-hook'.
Richard M. Stallman <rms@gnu.org>
parents: 87843
diff changeset
755 {
0f04103be3bf (reset_buffer_local_variables): Implement `permanent-local-hook'.
Richard M. Stallman <rms@gnu.org>
parents: 87843
diff changeset
756 /* If permanent-local, keep it. */
0f04103be3bf (reset_buffer_local_variables): Implement `permanent-local-hook'.
Richard M. Stallman <rms@gnu.org>
parents: 87843
diff changeset
757 last = tmp;
0f04103be3bf (reset_buffer_local_variables): Implement `permanent-local-hook'.
Richard M. Stallman <rms@gnu.org>
parents: 87843
diff changeset
758 if (EQ (prop, Qpermanent_local_hook))
0f04103be3bf (reset_buffer_local_variables): Implement `permanent-local-hook'.
Richard M. Stallman <rms@gnu.org>
parents: 87843
diff changeset
759 {
0f04103be3bf (reset_buffer_local_variables): Implement `permanent-local-hook'.
Richard M. Stallman <rms@gnu.org>
parents: 87843
diff changeset
760 /* This is a partially permanent hook variable.
0f04103be3bf (reset_buffer_local_variables): Implement `permanent-local-hook'.
Richard M. Stallman <rms@gnu.org>
parents: 87843
diff changeset
761 Preserve only the elements that want to be preserved. */
0f04103be3bf (reset_buffer_local_variables): Implement `permanent-local-hook'.
Richard M. Stallman <rms@gnu.org>
parents: 87843
diff changeset
762 Lisp_Object list, newlist;
0f04103be3bf (reset_buffer_local_variables): Implement `permanent-local-hook'.
Richard M. Stallman <rms@gnu.org>
parents: 87843
diff changeset
763 list = XCDR (XCAR (tmp));
0f04103be3bf (reset_buffer_local_variables): Implement `permanent-local-hook'.
Richard M. Stallman <rms@gnu.org>
parents: 87843
diff changeset
764 if (!CONSP (list))
0f04103be3bf (reset_buffer_local_variables): Implement `permanent-local-hook'.
Richard M. Stallman <rms@gnu.org>
parents: 87843
diff changeset
765 newlist = list;
0f04103be3bf (reset_buffer_local_variables): Implement `permanent-local-hook'.
Richard M. Stallman <rms@gnu.org>
parents: 87843
diff changeset
766 else
0f04103be3bf (reset_buffer_local_variables): Implement `permanent-local-hook'.
Richard M. Stallman <rms@gnu.org>
parents: 87843
diff changeset
767 for (newlist = Qnil; CONSP (list); list = XCDR (list))
0f04103be3bf (reset_buffer_local_variables): Implement `permanent-local-hook'.
Richard M. Stallman <rms@gnu.org>
parents: 87843
diff changeset
768 {
0f04103be3bf (reset_buffer_local_variables): Implement `permanent-local-hook'.
Richard M. Stallman <rms@gnu.org>
parents: 87843
diff changeset
769 Lisp_Object elt = XCAR (list);
0f04103be3bf (reset_buffer_local_variables): Implement `permanent-local-hook'.
Richard M. Stallman <rms@gnu.org>
parents: 87843
diff changeset
770 /* Preserve element ELT if it's t,
0f04103be3bf (reset_buffer_local_variables): Implement `permanent-local-hook'.
Richard M. Stallman <rms@gnu.org>
parents: 87843
diff changeset
771 if it is a function with a `permanent-local-hook' property,
0f04103be3bf (reset_buffer_local_variables): Implement `permanent-local-hook'.
Richard M. Stallman <rms@gnu.org>
parents: 87843
diff changeset
772 or if it's not a symbol. */
0f04103be3bf (reset_buffer_local_variables): Implement `permanent-local-hook'.
Richard M. Stallman <rms@gnu.org>
parents: 87843
diff changeset
773 if (! SYMBOLP (elt)
0f04103be3bf (reset_buffer_local_variables): Implement `permanent-local-hook'.
Richard M. Stallman <rms@gnu.org>
parents: 87843
diff changeset
774 || EQ (elt, Qt)
0f04103be3bf (reset_buffer_local_variables): Implement `permanent-local-hook'.
Richard M. Stallman <rms@gnu.org>
parents: 87843
diff changeset
775 || !NILP (Fget (elt, Qpermanent_local_hook)))
0f04103be3bf (reset_buffer_local_variables): Implement `permanent-local-hook'.
Richard M. Stallman <rms@gnu.org>
parents: 87843
diff changeset
776 newlist = Fcons (elt, newlist);
0f04103be3bf (reset_buffer_local_variables): Implement `permanent-local-hook'.
Richard M. Stallman <rms@gnu.org>
parents: 87843
diff changeset
777 }
0f04103be3bf (reset_buffer_local_variables): Implement `permanent-local-hook'.
Richard M. Stallman <rms@gnu.org>
parents: 87843
diff changeset
778 XSETCDR (XCAR (tmp), Fnreverse (newlist));
0f04103be3bf (reset_buffer_local_variables): Implement `permanent-local-hook'.
Richard M. Stallman <rms@gnu.org>
parents: 87843
diff changeset
779 }
0f04103be3bf (reset_buffer_local_variables): Implement `permanent-local-hook'.
Richard M. Stallman <rms@gnu.org>
parents: 87843
diff changeset
780 }
0f04103be3bf (reset_buffer_local_variables): Implement `permanent-local-hook'.
Richard M. Stallman <rms@gnu.org>
parents: 87843
diff changeset
781 /* Delete this local variable. */
87218
409f76c92cb2 (reset_buffer_local_variables): If permanent_too is 0, also
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 87215
diff changeset
782 else if (NILP (last))
409f76c92cb2 (reset_buffer_local_variables): If permanent_too is 0, also
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 87215
diff changeset
783 b->local_var_alist = XCDR (tmp);
409f76c92cb2 (reset_buffer_local_variables): If permanent_too is 0, also
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 87215
diff changeset
784 else
409f76c92cb2 (reset_buffer_local_variables): If permanent_too is 0, also
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 87215
diff changeset
785 XSETCDR (last, XCDR (tmp));
409f76c92cb2 (reset_buffer_local_variables): If permanent_too is 0, also
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 87215
diff changeset
786 }
409f76c92cb2 (reset_buffer_local_variables): If permanent_too is 0, also
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 87215
diff changeset
787
28352
1555145f8c35 (buffer_permanent_local_flags): Use MAX_PER_BUFFER_VARS
Gerd Moellmann <gerd@gnu.org>
parents: 28332
diff changeset
788 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
789 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
790 SET_PER_BUFFER_VALUE_P (b, i, 0);
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
791
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
792 /* For each slot that has a default value,
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
793 copy that into the slot. */
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
794
91781
a6047ef14f4c (clone_per_buffer_values, reset_buffer_local_variables)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 91711
diff changeset
795 /* buffer-local Lisp variables start at `undo_list',
a6047ef14f4c (clone_per_buffer_values, reset_buffer_local_variables)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 91711
diff changeset
796 tho only the ones from `name' on are GC'd normally. */
a6047ef14f4c (clone_per_buffer_values, reset_buffer_local_variables)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 91711
diff changeset
797 for (offset = PER_BUFFER_VAR_OFFSET (undo_list);
28314
c46e609d887a (buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents: 28207
diff changeset
798 offset < sizeof *b;
c46e609d887a (buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents: 28207
diff changeset
799 offset += sizeof (Lisp_Object))
9362
f6dc29e7e986 (init_buffer_once): Don't use XSETFASTINT when negative.
Karl Heuer <kwzh@gnu.org>
parents: 9335
diff changeset
800 {
28352
1555145f8c35 (buffer_permanent_local_flags): Use MAX_PER_BUFFER_VARS
Gerd Moellmann <gerd@gnu.org>
parents: 28332
diff changeset
801 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
802 if ((idx > 0
c46e609d887a (buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents: 28207
diff changeset
803 && (permanent_too
107984
bef5d1738c0b Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 107845
diff changeset
804 || buffer_permanent_local_flags[idx] == 0)))
28352
1555145f8c35 (buffer_permanent_local_flags): Use MAX_PER_BUFFER_VARS
Gerd Moellmann <gerd@gnu.org>
parents: 28332
diff changeset
805 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
806 }
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
807 }
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
808
392
dce611246f59 *** empty log message ***
Roland McGrath <roland@gnu.org>
parents: 333
diff changeset
809 /* We split this away from generate-new-buffer, because rename-buffer
dce611246f59 *** empty log message ***
Roland McGrath <roland@gnu.org>
parents: 333
diff changeset
810 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
811 rename the buffer properly. */
dce611246f59 *** empty log message ***
Roland McGrath <roland@gnu.org>
parents: 333
diff changeset
812
dce611246f59 *** empty log message ***
Roland McGrath <roland@gnu.org>
parents: 333
diff changeset
813 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
814 1, 2, 0,
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39974
diff changeset
815 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
816 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
817 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
818 \(starting at 2) until an unused name is found, and then return that name.
75784
ea846c2df7e0 Reflow docstrings.
Juanma Barranquero <lekktu@gmail.com>
parents: 75348
diff changeset
819 Optional second argument IGNORE specifies a name that is okay to use (if
ea846c2df7e0 Reflow docstrings.
Juanma Barranquero <lekktu@gmail.com>
parents: 75348
diff changeset
820 it is in the sequence to be tried) even if a buffer with that name exists. */)
109179
8cfee7d2955f Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109165
diff changeset
821 (register Lisp_Object name, Lisp_Object ignore)
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
822 {
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
823 register Lisp_Object gentemp, tem;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
824 int count;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
825 char number[10];
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
826
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40605
diff changeset
827 CHECK_STRING (name);
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
828
54786
870b7a6bffb8 (Fgenerate_new_buffer_name): Return NAME argument if IGNORE argument
Luc Teirlinck <teirllm@auburn.edu>
parents: 54772
diff changeset
829 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
830 if (!NILP (tem))
870b7a6bffb8 (Fgenerate_new_buffer_name): Return NAME argument if IGNORE argument
Luc Teirlinck <teirllm@auburn.edu>
parents: 54772
diff changeset
831 return name;
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
832 tem = Fget_buffer (name);
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 392
diff changeset
833 if (NILP (tem))
392
dce611246f59 *** empty log message ***
Roland McGrath <roland@gnu.org>
parents: 333
diff changeset
834 return name;
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
835
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
836 count = 1;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
837 while (1)
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
838 {
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
839 sprintf (number, "<%d>", ++count);
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
840 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
841 tem = Fstring_equal (gentemp, ignore);
3226
bc4beddaf2c7 (Fgenerate_new_buffer_name): New arg IGNORE.
Richard M. Stallman <rms@gnu.org>
parents: 3204
diff changeset
842 if (!NILP (tem))
bc4beddaf2c7 (Fgenerate_new_buffer_name): New arg IGNORE.
Richard M. Stallman <rms@gnu.org>
parents: 3204
diff changeset
843 return gentemp;
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
844 tem = Fget_buffer (gentemp);
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 392
diff changeset
845 if (NILP (tem))
392
dce611246f59 *** empty log message ***
Roland McGrath <roland@gnu.org>
parents: 333
diff changeset
846 return gentemp;
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
847 }
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
848 }
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
849
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
850
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
851 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
852 doc: /* Return the name of BUFFER, as a string.
105641
f51e9b41be2c * buffer.c (Fbuffer_name): Doc fix. (Bug#4728)
Juanma Barranquero <lekktu@gmail.com>
parents: 104793
diff changeset
853 BUFFER defaults to the current buffer.
f51e9b41be2c * buffer.c (Fbuffer_name): Doc fix. (Bug#4728)
Juanma Barranquero <lekktu@gmail.com>
parents: 104793
diff changeset
854 Return nil if BUFFER has been killed. */)
109179
8cfee7d2955f Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109165
diff changeset
855 (register Lisp_Object buffer)
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
856 {
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 392
diff changeset
857 if (NILP (buffer))
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
858 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
859 CHECK_BUFFER (buffer);
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
860 return XBUFFER (buffer)->name;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
861 }
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
862
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
863 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
864 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
865 No argument or nil as argument means use the current buffer. */)
109179
8cfee7d2955f Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109165
diff changeset
866 (register Lisp_Object buffer)
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
867 {
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 392
diff changeset
868 if (NILP (buffer))
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
869 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
870 CHECK_BUFFER (buffer);
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
871 return XBUFFER (buffer)->filename;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
872 }
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
873
10314
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
874 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
875 0, 1, 0,
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39974
diff changeset
876 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
877 If BUFFER is not indirect, return nil.
95d283fb2215 (Fbuffer_base_buffer): Doc fix.
Luc Teirlinck <teirllm@auburn.edu>
parents: 54834
diff changeset
878 BUFFER defaults to the current buffer. */)
109179
8cfee7d2955f Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109165
diff changeset
879 (register Lisp_Object buffer)
10314
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
880 {
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
881 struct buffer *base;
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
882 Lisp_Object base_buffer;
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
883
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
884 if (NILP (buffer))
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
885 base = current_buffer->base_buffer;
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
886 else
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
887 {
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40605
diff changeset
888 CHECK_BUFFER (buffer);
10314
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
889 base = XBUFFER (buffer)->base_buffer;
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
890 }
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
891
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
892 if (! base)
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
893 return Qnil;
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
894 XSETBUFFER (base_buffer, base);
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
895 return base_buffer;
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
896 }
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
897
40725
a8af2e89346c (Fbuffer_local_value): New function.
Richard M. Stallman <rms@gnu.org>
parents: 40656
diff changeset
898 DEFUN ("buffer-local-value", Fbuffer_local_value,
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49444
diff changeset
899 Sbuffer_local_value, 2, 2, 0,
40725
a8af2e89346c (Fbuffer_local_value): New function.
Richard M. Stallman <rms@gnu.org>
parents: 40656
diff changeset
900 doc: /* Return the value of VARIABLE in BUFFER.
a8af2e89346c (Fbuffer_local_value): New function.
Richard M. Stallman <rms@gnu.org>
parents: 40656
diff changeset
901 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
902 is the default binding of the variable. */)
109179
8cfee7d2955f Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109165
diff changeset
903 (register Lisp_Object variable, register Lisp_Object buffer)
40725
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 register struct buffer *buf;
a8af2e89346c (Fbuffer_local_value): New function.
Richard M. Stallman <rms@gnu.org>
parents: 40656
diff changeset
906 register Lisp_Object result;
95112
0835cb21d60e * lisp.h (indirect_variable):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94963
diff changeset
907 struct Lisp_Symbol *sym;
40725
a8af2e89346c (Fbuffer_local_value): New function.
Richard M. Stallman <rms@gnu.org>
parents: 40656
diff changeset
908
62793
71f6142fcfb9 (Fbuffer_local_value): Make argument name match its use in docstring.
Juanma Barranquero <lekktu@gmail.com>
parents: 62069
diff changeset
909 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
910 CHECK_BUFFER (buffer);
40725
a8af2e89346c (Fbuffer_local_value): New function.
Richard M. Stallman <rms@gnu.org>
parents: 40656
diff changeset
911 buf = XBUFFER (buffer);
107984
bef5d1738c0b Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 107845
diff changeset
912 sym = XSYMBOL (variable);
bef5d1738c0b Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 107845
diff changeset
913
bef5d1738c0b Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 107845
diff changeset
914 start:
bef5d1738c0b Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 107845
diff changeset
915 switch (sym->redirect)
40725
a8af2e89346c (Fbuffer_local_value): New function.
Richard M. Stallman <rms@gnu.org>
parents: 40656
diff changeset
916 {
107984
bef5d1738c0b Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 107845
diff changeset
917 case SYMBOL_VARALIAS: sym = indirect_variable (sym); goto start;
bef5d1738c0b Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 107845
diff changeset
918 case SYMBOL_PLAINVAL: result = SYMBOL_VAL (sym); break;
bef5d1738c0b Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 107845
diff changeset
919 case SYMBOL_LOCALIZED:
bef5d1738c0b Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 107845
diff changeset
920 { /* Look in local_var_alist. */
bef5d1738c0b Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 107845
diff changeset
921 struct Lisp_Buffer_Local_Value *blv = SYMBOL_BLV (sym);
bef5d1738c0b Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 107845
diff changeset
922 XSETSYMBOL (variable, sym); /* Update In case of aliasing. */
bef5d1738c0b Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 107845
diff changeset
923 result = Fassoc (variable, buf->local_var_alist);
bef5d1738c0b Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 107845
diff changeset
924 if (!NILP (result))
bef5d1738c0b Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 107845
diff changeset
925 {
bef5d1738c0b Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 107845
diff changeset
926 if (blv->fwd)
bef5d1738c0b Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 107845
diff changeset
927 { /* What binding is loaded right now? */
bef5d1738c0b Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 107845
diff changeset
928 Lisp_Object current_alist_element = blv->valcell;
bef5d1738c0b Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 107845
diff changeset
929
bef5d1738c0b Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 107845
diff changeset
930 /* The value of the currently loaded binding is not
bef5d1738c0b Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 107845
diff changeset
931 stored in it, but rather in the realvalue slot.
bef5d1738c0b Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 107845
diff changeset
932 Store that value into the binding it belongs to
bef5d1738c0b Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 107845
diff changeset
933 in case that is the one we are about to use. */
bef5d1738c0b Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 107845
diff changeset
934
bef5d1738c0b Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 107845
diff changeset
935 XSETCDR (current_alist_element,
bef5d1738c0b Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 107845
diff changeset
936 do_symval_forwarding (blv->fwd));
bef5d1738c0b Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 107845
diff changeset
937 }
bef5d1738c0b Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 107845
diff changeset
938 /* Now get the (perhaps updated) value out of the binding. */
bef5d1738c0b Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 107845
diff changeset
939 result = XCDR (result);
bef5d1738c0b Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 107845
diff changeset
940 }
bef5d1738c0b Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 107845
diff changeset
941 else
bef5d1738c0b Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 107845
diff changeset
942 result = Fdefault_value (variable);
bef5d1738c0b Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 107845
diff changeset
943 break;
bef5d1738c0b Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 107845
diff changeset
944 }
bef5d1738c0b Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 107845
diff changeset
945 case SYMBOL_FORWARDED:
bef5d1738c0b Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 107845
diff changeset
946 {
bef5d1738c0b Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 107845
diff changeset
947 union Lisp_Fwd *fwd = SYMBOL_FWD (sym);
bef5d1738c0b Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 107845
diff changeset
948 if (BUFFER_OBJFWDP (fwd))
bef5d1738c0b Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 107845
diff changeset
949 result = PER_BUFFER_VALUE (buf, XBUFFER_OBJFWD (fwd)->offset);
bef5d1738c0b Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 107845
diff changeset
950 else
bef5d1738c0b Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 107845
diff changeset
951 result = Fdefault_value (variable);
bef5d1738c0b Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 107845
diff changeset
952 break;
bef5d1738c0b Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 107845
diff changeset
953 }
bef5d1738c0b Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 107845
diff changeset
954 default: abort ();
46199
ca604a52d267 (Fbuffer_local_value): Store current value into its binding
Richard M. Stallman <rms@gnu.org>
parents: 46016
diff changeset
955 }
40725
a8af2e89346c (Fbuffer_local_value): New function.
Richard M. Stallman <rms@gnu.org>
parents: 40656
diff changeset
956
71968
b0505e901bff (Fbuffer_local_value, Fbarf_if_buffer_read_only):
Kim F. Storm <storm@cua.dk>
parents: 70931
diff changeset
957 if (!EQ (result, Qunbound))
b0505e901bff (Fbuffer_local_value, Fbarf_if_buffer_read_only):
Kim F. Storm <storm@cua.dk>
parents: 70931
diff changeset
958 return result;
b0505e901bff (Fbuffer_local_value, Fbarf_if_buffer_read_only):
Kim F. Storm <storm@cua.dk>
parents: 70931
diff changeset
959
b0505e901bff (Fbuffer_local_value, Fbarf_if_buffer_read_only):
Kim F. Storm <storm@cua.dk>
parents: 70931
diff changeset
960 xsignal1 (Qvoid_variable, variable);
40725
a8af2e89346c (Fbuffer_local_value): New function.
Richard M. Stallman <rms@gnu.org>
parents: 40656
diff changeset
961 }
a8af2e89346c (Fbuffer_local_value): New function.
Richard M. Stallman <rms@gnu.org>
parents: 40656
diff changeset
962
60683
d2f6fa8790f3 (buffer_lisp_local_variables): New function,
Richard M. Stallman <rms@gnu.org>
parents: 60248
diff changeset
963 /* 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
964 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
965 in special slots in the buffer object. */
d2f6fa8790f3 (buffer_lisp_local_variables): New function,
Richard M. Stallman <rms@gnu.org>
parents: 60248
diff changeset
966
d2f6fa8790f3 (buffer_lisp_local_variables): New function,
Richard M. Stallman <rms@gnu.org>
parents: 60248
diff changeset
967 static Lisp_Object
109144
7dceae91724c Convert most remaining function definitions to standard C.
Juanma Barranquero <lekktu@gmail.com>
parents: 109100
diff changeset
968 buffer_lisp_local_variables (struct buffer *buf)
60683
d2f6fa8790f3 (buffer_lisp_local_variables): New function,
Richard M. Stallman <rms@gnu.org>
parents: 60248
diff changeset
969 {
d2f6fa8790f3 (buffer_lisp_local_variables): New function,
Richard M. Stallman <rms@gnu.org>
parents: 60248
diff changeset
970 Lisp_Object result = Qnil;
d2f6fa8790f3 (buffer_lisp_local_variables): New function,
Richard M. Stallman <rms@gnu.org>
parents: 60248
diff changeset
971 register Lisp_Object tail;
d2f6fa8790f3 (buffer_lisp_local_variables): New function,
Richard M. Stallman <rms@gnu.org>
parents: 60248
diff changeset
972 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
973 {
d2f6fa8790f3 (buffer_lisp_local_variables): New function,
Richard M. Stallman <rms@gnu.org>
parents: 60248
diff changeset
974 Lisp_Object val, elt;
d2f6fa8790f3 (buffer_lisp_local_variables): New function,
Richard M. Stallman <rms@gnu.org>
parents: 60248
diff changeset
975
d2f6fa8790f3 (buffer_lisp_local_variables): New function,
Richard M. Stallman <rms@gnu.org>
parents: 60248
diff changeset
976 elt = XCAR (tail);
d2f6fa8790f3 (buffer_lisp_local_variables): New function,
Richard M. Stallman <rms@gnu.org>
parents: 60248
diff changeset
977
d2f6fa8790f3 (buffer_lisp_local_variables): New function,
Richard M. Stallman <rms@gnu.org>
parents: 60248
diff changeset
978 /* 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
979 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
980 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
981 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
982 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
983 val = find_symbol_value (XCAR (elt));
d2f6fa8790f3 (buffer_lisp_local_variables): New function,
Richard M. Stallman <rms@gnu.org>
parents: 60248
diff changeset
984 /* 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
985 if (buf != current_buffer)
d2f6fa8790f3 (buffer_lisp_local_variables): New function,
Richard M. Stallman <rms@gnu.org>
parents: 60248
diff changeset
986 val = XCDR (elt);
d2f6fa8790f3 (buffer_lisp_local_variables): New function,
Richard M. Stallman <rms@gnu.org>
parents: 60248
diff changeset
987
107984
bef5d1738c0b Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 107845
diff changeset
988 result = Fcons (Fcons (XCAR (elt), val), result);
60683
d2f6fa8790f3 (buffer_lisp_local_variables): New function,
Richard M. Stallman <rms@gnu.org>
parents: 60248
diff changeset
989 }
d2f6fa8790f3 (buffer_lisp_local_variables): New function,
Richard M. Stallman <rms@gnu.org>
parents: 60248
diff changeset
990
d2f6fa8790f3 (buffer_lisp_local_variables): New function,
Richard M. Stallman <rms@gnu.org>
parents: 60248
diff changeset
991 return result;
d2f6fa8790f3 (buffer_lisp_local_variables): New function,
Richard M. Stallman <rms@gnu.org>
parents: 60248
diff changeset
992 }
d2f6fa8790f3 (buffer_lisp_local_variables): New function,
Richard M. Stallman <rms@gnu.org>
parents: 60248
diff changeset
993
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
994 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
995 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
996 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
997 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
998 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
999 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
1000 No argument or nil as argument means use current buffer as BUFFER. */)
109179
8cfee7d2955f Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109165
diff changeset
1001 (register Lisp_Object buffer)
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1002 {
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1003 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
1004 register Lisp_Object result;
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1005
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 392
diff changeset
1006 if (NILP (buffer))
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1007 buf = current_buffer;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1008 else
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1009 {
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40605
diff changeset
1010 CHECK_BUFFER (buffer);
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1011 buf = XBUFFER (buffer);
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1012 }
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1013
60683
d2f6fa8790f3 (buffer_lisp_local_variables): New function,
Richard M. Stallman <rms@gnu.org>
parents: 60248
diff changeset
1014 result = buffer_lisp_local_variables (buf);
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1015
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1016 /* Add on all the variables stored in special slots. */
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1017 {
28314
c46e609d887a (buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents: 28207
diff changeset
1018 int offset, idx;
c46e609d887a (buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents: 28207
diff changeset
1019
91781
a6047ef14f4c (clone_per_buffer_values, reset_buffer_local_variables)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 91711
diff changeset
1020 /* buffer-local Lisp variables start at `undo_list',
a6047ef14f4c (clone_per_buffer_values, reset_buffer_local_variables)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 91711
diff changeset
1021 tho only the ones from `name' on are GC'd normally. */
a6047ef14f4c (clone_per_buffer_values, reset_buffer_local_variables)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 91711
diff changeset
1022 for (offset = PER_BUFFER_VAR_OFFSET (undo_list);
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1023 offset < sizeof (struct buffer);
28314
c46e609d887a (buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents: 28207
diff changeset
1024 /* sizeof EMACS_INT == sizeof Lisp_Object */
c46e609d887a (buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents: 28207
diff changeset
1025 offset += (sizeof (EMACS_INT)))
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1026 {
28352
1555145f8c35 (buffer_permanent_local_flags): Use MAX_PER_BUFFER_VARS
Gerd Moellmann <gerd@gnu.org>
parents: 28332
diff changeset
1027 idx = PER_BUFFER_IDX (offset);
1555145f8c35 (buffer_permanent_local_flags): Use MAX_PER_BUFFER_VARS
Gerd Moellmann <gerd@gnu.org>
parents: 28332
diff changeset
1028 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
1029 && SYMBOLP (PER_BUFFER_SYMBOL (offset)))
1555145f8c35 (buffer_permanent_local_flags): Use MAX_PER_BUFFER_VARS
Gerd Moellmann <gerd@gnu.org>
parents: 28332
diff changeset
1030 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
1031 PER_BUFFER_VALUE (buf, offset)),
28314
c46e609d887a (buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents: 28207
diff changeset
1032 result);
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1033 }
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1034 }
4100
f8c6e5e9603f (Fbuffer_local_variables): For local var that is unbound,
Richard M. Stallman <rms@gnu.org>
parents: 4077
diff changeset
1035
f8c6e5e9603f (Fbuffer_local_variables): For local var that is unbound,
Richard M. Stallman <rms@gnu.org>
parents: 4077
diff changeset
1036 return result;
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1037 }
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1038
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1039 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
1040 0, 1, 0,
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39974
diff changeset
1041 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
1042 No argument or nil as argument means use current buffer as BUFFER. */)
109179
8cfee7d2955f Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109165
diff changeset
1043 (register Lisp_Object buffer)
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1044 {
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1045 register struct buffer *buf;
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 392
diff changeset
1046 if (NILP (buffer))
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1047 buf = current_buffer;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1048 else
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1049 {
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40605
diff changeset
1050 CHECK_BUFFER (buffer);
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1051 buf = XBUFFER (buffer);
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1052 }
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1053
10314
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1054 return BUF_SAVE_MODIFF (buf) < BUF_MODIFF (buf) ? Qt : Qnil;
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1055 }
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1056
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1057 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
1058 1, 1, 0,
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39974
diff changeset
1059 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
1060 A non-nil FLAG means mark the buffer modified. */)
109179
8cfee7d2955f Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109165
diff changeset
1061 (register Lisp_Object flag)
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1062 {
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1063 register int already;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1064 register Lisp_Object fn;
28207
fd3ece8a61e5 (Fset_buffer_modified_p): Set update_mode_lines
Gerd Moellmann <gerd@gnu.org>
parents: 27739
diff changeset
1065 Lisp_Object buffer, window;
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1066
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1067 #ifdef CLASH_DETECTION
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1068 /* If buffer becoming modified, lock the file.
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1069 If buffer becoming unmodified, unlock the file. */
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1070
11659
f9b6e65774e7 (Fset_buffer_modified_p): Use the truename for locking.
Richard M. Stallman <rms@gnu.org>
parents: 11473
diff changeset
1071 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
1072 /* 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
1073 if (!NILP (fn) && ! NILP (current_buffer->filename))
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1074 {
10314
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1075 already = SAVE_MODIFF < MODIFF;
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 392
diff changeset
1076 if (!already && !NILP (flag))
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1077 lock_file (fn);
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 392
diff changeset
1078 else if (already && NILP (flag))
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1079 unlock_file (fn);
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1080 }
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1081 #endif /* CLASH_DETECTION */
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1082
106813
4040ecb0c904 Try to fix bug#5314. This is probably not the final word, tho.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106185
diff changeset
1083 /* Here we have a problem. SAVE_MODIFF is used here to encode
4040ecb0c904 Try to fix bug#5314. This is probably not the final word, tho.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106185
diff changeset
1084 buffer-modified-p (as SAVE_MODIFF<MODIFF) as well as
4040ecb0c904 Try to fix bug#5314. This is probably not the final word, tho.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106185
diff changeset
1085 recent-auto-save-p (as SAVE_MODIFF<auto_save_modified). So if we
4040ecb0c904 Try to fix bug#5314. This is probably not the final word, tho.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106185
diff changeset
1086 modify SAVE_MODIFF to affect one, we may affect the other
4040ecb0c904 Try to fix bug#5314. This is probably not the final word, tho.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106185
diff changeset
1087 as well.
4040ecb0c904 Try to fix bug#5314. This is probably not the final word, tho.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106185
diff changeset
1088 E.g. if FLAG is nil we need to set SAVE_MODIFF to MODIFF, but
4040ecb0c904 Try to fix bug#5314. This is probably not the final word, tho.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106185
diff changeset
1089 if SAVE_MODIFF<auto_save_modified that means we risk changing
4040ecb0c904 Try to fix bug#5314. This is probably not the final word, tho.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106185
diff changeset
1090 recent-auto-save-p from t to nil.
4040ecb0c904 Try to fix bug#5314. This is probably not the final word, tho.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106185
diff changeset
1091 Vice versa, if FLAG is non-nil and SAVE_MODIFF>=auto_save_modified
4040ecb0c904 Try to fix bug#5314. This is probably not the final word, tho.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106185
diff changeset
1092 we risk changing recent-auto-save-p from nil to t. */
4040ecb0c904 Try to fix bug#5314. This is probably not the final word, tho.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106185
diff changeset
1093 SAVE_MODIFF = (NILP (flag)
4040ecb0c904 Try to fix bug#5314. This is probably not the final word, tho.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106185
diff changeset
1094 /* FIXME: This unavoidably sets recent-auto-save-p to nil. */
4040ecb0c904 Try to fix bug#5314. This is probably not the final word, tho.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106185
diff changeset
1095 ? MODIFF
4040ecb0c904 Try to fix bug#5314. This is probably not the final word, tho.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106185
diff changeset
1096 /* Let's try to preserve recent-auto-save-p. */
4040ecb0c904 Try to fix bug#5314. This is probably not the final word, tho.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106185
diff changeset
1097 : SAVE_MODIFF < MODIFF ? SAVE_MODIFF
4040ecb0c904 Try to fix bug#5314. This is probably not the final word, tho.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106185
diff changeset
1098 /* If SAVE_MODIFF == auto_save_modified == MODIFF,
4040ecb0c904 Try to fix bug#5314. This is probably not the final word, tho.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106185
diff changeset
1099 we can either decrease SAVE_MODIFF and auto_save_modified
4040ecb0c904 Try to fix bug#5314. This is probably not the final word, tho.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106185
diff changeset
1100 or increase MODIFF. */
4040ecb0c904 Try to fix bug#5314. This is probably not the final word, tho.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106185
diff changeset
1101 : MODIFF++);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49444
diff changeset
1102
28207
fd3ece8a61e5 (Fset_buffer_modified_p): Set update_mode_lines
Gerd Moellmann <gerd@gnu.org>
parents: 27739
diff changeset
1103 /* 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
1104 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
1105 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
1106 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
1107 (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
1108 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
1109 update_modes_lines unconditionally.
fd3ece8a61e5 (Fset_buffer_modified_p): Set update_mode_lines
Gerd Moellmann <gerd@gnu.org>
parents: 27739
diff changeset
1110
fd3ece8a61e5 (Fset_buffer_modified_p): Set update_mode_lines
Gerd Moellmann <gerd@gnu.org>
parents: 27739
diff changeset
1111 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
1112 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
1113 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
1114 XSETBUFFER (buffer, current_buffer);
fd3ece8a61e5 (Fset_buffer_modified_p): Set update_mode_lines
Gerd Moellmann <gerd@gnu.org>
parents: 27739
diff changeset
1115 window = Fget_buffer_window (buffer, Qt);
fd3ece8a61e5 (Fset_buffer_modified_p): Set update_mode_lines
Gerd Moellmann <gerd@gnu.org>
parents: 27739
diff changeset
1116 if (WINDOWP (window))
35339
e5e6579e8308 (Fset_buffer_modified_p): Set buffer's
Gerd Moellmann <gerd@gnu.org>
parents: 34488
diff changeset
1117 {
e5e6579e8308 (Fset_buffer_modified_p): Set buffer's
Gerd Moellmann <gerd@gnu.org>
parents: 34488
diff changeset
1118 ++update_mode_lines;
e5e6579e8308 (Fset_buffer_modified_p): Set buffer's
Gerd Moellmann <gerd@gnu.org>
parents: 34488
diff changeset
1119 current_buffer->prevent_redisplay_optimizations_p = 1;
e5e6579e8308 (Fset_buffer_modified_p): Set buffer's
Gerd Moellmann <gerd@gnu.org>
parents: 34488
diff changeset
1120 }
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49444
diff changeset
1121
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1122 return flag;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1123 }
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1124
28518
5da961b04d97 (Frestore_buffer_modified_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28417
diff changeset
1125 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
1126 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
1127 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
1128 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
1129 state of the current buffer. Use with care. */)
109179
8cfee7d2955f Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109165
diff changeset
1130 (Lisp_Object flag)
28518
5da961b04d97 (Frestore_buffer_modified_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28417
diff changeset
1131 {
5da961b04d97 (Frestore_buffer_modified_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28417
diff changeset
1132 #ifdef CLASH_DETECTION
5da961b04d97 (Frestore_buffer_modified_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28417
diff changeset
1133 Lisp_Object fn;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49444
diff changeset
1134
28518
5da961b04d97 (Frestore_buffer_modified_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28417
diff changeset
1135 /* If buffer becoming modified, lock the file.
5da961b04d97 (Frestore_buffer_modified_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28417
diff changeset
1136 If buffer becoming unmodified, unlock the file. */
5da961b04d97 (Frestore_buffer_modified_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28417
diff changeset
1137
5da961b04d97 (Frestore_buffer_modified_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28417
diff changeset
1138 fn = current_buffer->file_truename;
5da961b04d97 (Frestore_buffer_modified_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28417
diff changeset
1139 /* 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
1140 if (!NILP (fn) && ! NILP (current_buffer->filename))
5da961b04d97 (Frestore_buffer_modified_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28417
diff changeset
1141 {
5da961b04d97 (Frestore_buffer_modified_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28417
diff changeset
1142 int already = SAVE_MODIFF < MODIFF;
5da961b04d97 (Frestore_buffer_modified_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28417
diff changeset
1143 if (!already && !NILP (flag))
5da961b04d97 (Frestore_buffer_modified_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28417
diff changeset
1144 lock_file (fn);
5da961b04d97 (Frestore_buffer_modified_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28417
diff changeset
1145 else if (already && NILP (flag))
5da961b04d97 (Frestore_buffer_modified_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28417
diff changeset
1146 unlock_file (fn);
5da961b04d97 (Frestore_buffer_modified_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28417
diff changeset
1147 }
5da961b04d97 (Frestore_buffer_modified_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28417
diff changeset
1148 #endif /* CLASH_DETECTION */
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49444
diff changeset
1149
28518
5da961b04d97 (Frestore_buffer_modified_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28417
diff changeset
1150 SAVE_MODIFF = NILP (flag) ? MODIFF : 0;
5da961b04d97 (Frestore_buffer_modified_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28417
diff changeset
1151 return flag;
5da961b04d97 (Frestore_buffer_modified_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28417
diff changeset
1152 }
5da961b04d97 (Frestore_buffer_modified_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28417
diff changeset
1153
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1154 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
1155 0, 1, 0,
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39974
diff changeset
1156 doc: /* Return BUFFER's tick counter, incremented for each change in text.
75784
ea846c2df7e0 Reflow docstrings.
Juanma Barranquero <lekktu@gmail.com>
parents: 75348
diff changeset
1157 Each buffer has a tick counter which is incremented each time the
ea846c2df7e0 Reflow docstrings.
Juanma Barranquero <lekktu@gmail.com>
parents: 75348
diff changeset
1158 text in that buffer is changed. It wraps around occasionally.
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39974
diff changeset
1159 No argument or nil as argument means use current buffer as BUFFER. */)
109179
8cfee7d2955f Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109165
diff changeset
1160 (register Lisp_Object buffer)
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 struct buffer *buf;
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 392
diff changeset
1163 if (NILP (buffer))
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1164 buf = current_buffer;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1165 else
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1166 {
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40605
diff changeset
1167 CHECK_BUFFER (buffer);
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1168 buf = XBUFFER (buffer);
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1169 }
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1170
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1171 return make_number (BUF_MODIFF (buf));
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1172 }
72592
f6de516bbb4b * buffer.h (struct buffer_text): New field chars_modiff.
Chong Yidong <cyd@stupidchicken.com>
parents: 72532
diff changeset
1173
f6de516bbb4b * buffer.h (struct buffer_text): New field chars_modiff.
Chong Yidong <cyd@stupidchicken.com>
parents: 72532
diff changeset
1174 DEFUN ("buffer-chars-modified-tick", Fbuffer_chars_modified_tick,
f6de516bbb4b * buffer.h (struct buffer_text): New field chars_modiff.
Chong Yidong <cyd@stupidchicken.com>
parents: 72532
diff changeset
1175 Sbuffer_chars_modified_tick, 0, 1, 0,
f6de516bbb4b * buffer.h (struct buffer_text): New field chars_modiff.
Chong Yidong <cyd@stupidchicken.com>
parents: 72532
diff changeset
1176 doc: /* Return BUFFER's character-change tick counter.
f6de516bbb4b * buffer.h (struct buffer_text): New field chars_modiff.
Chong Yidong <cyd@stupidchicken.com>
parents: 72532
diff changeset
1177 Each buffer has a character-change tick counter, which is set to the
f6de516bbb4b * buffer.h (struct buffer_text): New field chars_modiff.
Chong Yidong <cyd@stupidchicken.com>
parents: 72532
diff changeset
1178 value of the buffer's tick counter \(see `buffer-modified-tick'), each
f6de516bbb4b * buffer.h (struct buffer_text): New field chars_modiff.
Chong Yidong <cyd@stupidchicken.com>
parents: 72532
diff changeset
1179 time text in that buffer is inserted or deleted. By comparing the
72596
03f6ec3cc19d Minor doc fix.
Chong Yidong <cyd@stupidchicken.com>
parents: 72592
diff changeset
1180 values returned by two individual calls of `buffer-chars-modified-tick',
72592
f6de516bbb4b * buffer.h (struct buffer_text): New field chars_modiff.
Chong Yidong <cyd@stupidchicken.com>
parents: 72532
diff changeset
1181 you can tell whether a character change occurred in that buffer in
f6de516bbb4b * buffer.h (struct buffer_text): New field chars_modiff.
Chong Yidong <cyd@stupidchicken.com>
parents: 72532
diff changeset
1182 between these calls. No argument or nil as argument means use current
f6de516bbb4b * buffer.h (struct buffer_text): New field chars_modiff.
Chong Yidong <cyd@stupidchicken.com>
parents: 72532
diff changeset
1183 buffer as BUFFER. */)
109179
8cfee7d2955f Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109165
diff changeset
1184 (register Lisp_Object buffer)
72592
f6de516bbb4b * buffer.h (struct buffer_text): New field chars_modiff.
Chong Yidong <cyd@stupidchicken.com>
parents: 72532
diff changeset
1185 {
f6de516bbb4b * buffer.h (struct buffer_text): New field chars_modiff.
Chong Yidong <cyd@stupidchicken.com>
parents: 72532
diff changeset
1186 register struct buffer *buf;
f6de516bbb4b * buffer.h (struct buffer_text): New field chars_modiff.
Chong Yidong <cyd@stupidchicken.com>
parents: 72532
diff changeset
1187 if (NILP (buffer))
f6de516bbb4b * buffer.h (struct buffer_text): New field chars_modiff.
Chong Yidong <cyd@stupidchicken.com>
parents: 72532
diff changeset
1188 buf = current_buffer;
f6de516bbb4b * buffer.h (struct buffer_text): New field chars_modiff.
Chong Yidong <cyd@stupidchicken.com>
parents: 72532
diff changeset
1189 else
f6de516bbb4b * buffer.h (struct buffer_text): New field chars_modiff.
Chong Yidong <cyd@stupidchicken.com>
parents: 72532
diff changeset
1190 {
f6de516bbb4b * buffer.h (struct buffer_text): New field chars_modiff.
Chong Yidong <cyd@stupidchicken.com>
parents: 72532
diff changeset
1191 CHECK_BUFFER (buffer);
f6de516bbb4b * buffer.h (struct buffer_text): New field chars_modiff.
Chong Yidong <cyd@stupidchicken.com>
parents: 72532
diff changeset
1192 buf = XBUFFER (buffer);
f6de516bbb4b * buffer.h (struct buffer_text): New field chars_modiff.
Chong Yidong <cyd@stupidchicken.com>
parents: 72532
diff changeset
1193 }
f6de516bbb4b * buffer.h (struct buffer_text): New field chars_modiff.
Chong Yidong <cyd@stupidchicken.com>
parents: 72532
diff changeset
1194
f6de516bbb4b * buffer.h (struct buffer_text): New field chars_modiff.
Chong Yidong <cyd@stupidchicken.com>
parents: 72532
diff changeset
1195 return make_number (BUF_CHARS_MODIFF (buf));
f6de516bbb4b * buffer.h (struct buffer_text): New field chars_modiff.
Chong Yidong <cyd@stupidchicken.com>
parents: 72532
diff changeset
1196 }
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1197
392
dce611246f59 *** empty log message ***
Roland McGrath <roland@gnu.org>
parents: 333
diff changeset
1198 DEFUN ("rename-buffer", Frename_buffer, Srename_buffer, 1, 2,
87265
40dcde0eb331 (Frename_buffer): In interactive spec replace
Juri Linkov <juri@jurta.org>
parents: 87218
diff changeset
1199 "(list (read-string \"Rename buffer (to new name): \" \
40dcde0eb331 (Frename_buffer): In interactive spec replace
Juri Linkov <juri@jurta.org>
parents: 87218
diff changeset
1200 nil 'buffer-name-history (buffer-name (current-buffer))) \
40dcde0eb331 (Frename_buffer): In interactive spec replace
Juri Linkov <juri@jurta.org>
parents: 87218
diff changeset
1201 current-prefix-arg)",
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39974
diff changeset
1202 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
1203 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
1204 buffer named NEWNAME already exists.
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
1205 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
1206 `generate-new-buffer-name'.
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
1207 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
1208 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
1209 This does not change the name of the visited file (if any). */)
109179
8cfee7d2955f Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109165
diff changeset
1210 (register Lisp_Object newname, Lisp_Object unique)
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1211 {
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1212 register Lisp_Object tem, buf;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1213
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40605
diff changeset
1214 CHECK_STRING (newname);
9933
d3f22955b872 (Frename_buffer): Rename arg NAME to NEWNAME.
Richard M. Stallman <rms@gnu.org>
parents: 9922
diff changeset
1215
46370
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46293
diff changeset
1216 if (SCHARS (newname) == 0)
7455
35657813817c (Frename_buffer): Reject empty string as new name.
Richard M. Stallman <rms@gnu.org>
parents: 7434
diff changeset
1217 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
1218
9933
d3f22955b872 (Frename_buffer): Rename arg NAME to NEWNAME.
Richard M. Stallman <rms@gnu.org>
parents: 9922
diff changeset
1219 tem = Fget_buffer (newname);
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 392
diff changeset
1220 if (!NILP (tem))
392
dce611246f59 *** empty log message ***
Roland McGrath <roland@gnu.org>
parents: 333
diff changeset
1221 {
28417
4b675266db04 * lisp.h (XCONS, XSTRING, XSYMBOL, XFLOAT, XPROCESS, XWINDOW, XSUBR, XBUFFER):
Ken Raeburn <raeburn@raeburn.org>
parents: 28352
diff changeset
1222 /* 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
1223 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
1224 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
1225 (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
1226 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
1227 return current_buffer->name;
1876
0ddafa88e654 (Frename_buffer): Make prefix arg set UNIQUE.
Richard M. Stallman <rms@gnu.org>
parents: 1821
diff changeset
1228 if (!NILP (unique))
9933
d3f22955b872 (Frename_buffer): Rename arg NAME to NEWNAME.
Richard M. Stallman <rms@gnu.org>
parents: 9922
diff changeset
1229 newname = Fgenerate_new_buffer_name (newname, current_buffer->name);
392
dce611246f59 *** empty log message ***
Roland McGrath <roland@gnu.org>
parents: 333
diff changeset
1230 else
46370
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46293
diff changeset
1231 error ("Buffer name `%s' is in use", SDATA (newname));
392
dce611246f59 *** empty log message ***
Roland McGrath <roland@gnu.org>
parents: 333
diff changeset
1232 }
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1233
9933
d3f22955b872 (Frename_buffer): Rename arg NAME to NEWNAME.
Richard M. Stallman <rms@gnu.org>
parents: 9922
diff changeset
1234 current_buffer->name = newname;
1707
86c951f6a444 * buffer.c (Frename_buffer): Set update_mode_lines.
Jim Blandy <jimb@redhat.com>
parents: 1586
diff changeset
1235
86c951f6a444 * buffer.c (Frename_buffer): Set update_mode_lines.
Jim Blandy <jimb@redhat.com>
parents: 1586
diff changeset
1236 /* 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
1237 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
1238 update_mode_lines++;
86c951f6a444 * buffer.c (Frename_buffer): Set update_mode_lines.
Jim Blandy <jimb@redhat.com>
parents: 1586
diff changeset
1239
9262
582534b6e763 (Fget_buffer_create, Frename_buffer, Fbuffer_disable_undo,
Karl Heuer <kwzh@gnu.org>
parents: 9211
diff changeset
1240 XSETBUFFER (buf, current_buffer);
9933
d3f22955b872 (Frename_buffer): Rename arg NAME to NEWNAME.
Richard M. Stallman <rms@gnu.org>
parents: 9922
diff changeset
1241 Fsetcar (Frassq (buf, Vbuffer_alist), newname);
8599
cf3233d70e94 (Frename_buffer): Fix gcpro problems.
Karl Heuer <kwzh@gnu.org>
parents: 8550
diff changeset
1242 if (NILP (current_buffer->filename)
cf3233d70e94 (Frename_buffer): Fix gcpro problems.
Karl Heuer <kwzh@gnu.org>
parents: 8550
diff changeset
1243 && !NILP (current_buffer->auto_save_file_name))
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1244 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
1245 /* 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
1246 return current_buffer->name;
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1247 }
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1248
22189
2a61a0a3a9be (Fother_buffer): New arg FRAME. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents: 22171
diff changeset
1249 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
1250 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
1251 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
1252 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
1253 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
1254 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
1255 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
1256 If BUFFER is omitted or nil, some interesting buffer is returned. */)
109179
8cfee7d2955f Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109165
diff changeset
1257 (register Lisp_Object buffer, Lisp_Object visible_ok, Lisp_Object frame)
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1258 {
109144
7dceae91724c Convert most remaining function definitions to standard C.
Juanma Barranquero <lekktu@gmail.com>
parents: 109100
diff changeset
1259 Lisp_Object Fset_buffer_major_mode (Lisp_Object buffer);
17218
a57ca25e9c62 (reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents: 17124
diff changeset
1260 register Lisp_Object tail, buf, notsogood, tem, pred, add_ons;
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1261 notsogood = Qnil;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1262
22189
2a61a0a3a9be (Fother_buffer): New arg FRAME. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents: 22171
diff changeset
1263 if (NILP (frame))
25664
832aeb9c3996 (Fother_buffer): Change for Lisp_Object selected_frame.
Gerd Moellmann <gerd@gnu.org>
parents: 25653
diff changeset
1264 frame = selected_frame;
22189
2a61a0a3a9be (Fother_buffer): New arg FRAME. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents: 22171
diff changeset
1265
108880
f4a583b69ffa * src/buffer.c (Fother_buffer): Add CHECK_FRAME.
Juri Linkov <juri@jurta.org>
parents: 108806
diff changeset
1266 CHECK_FRAME (frame);
f4a583b69ffa * src/buffer.c (Fother_buffer): Add CHECK_FRAME.
Juri Linkov <juri@jurta.org>
parents: 108806
diff changeset
1267
17218
a57ca25e9c62 (reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents: 17124
diff changeset
1268 tail = Vbuffer_alist;
22189
2a61a0a3a9be (Fother_buffer): New arg FRAME. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents: 22171
diff changeset
1269 pred = frame_buffer_predicate (frame);
17218
a57ca25e9c62 (reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents: 17124
diff changeset
1270
a57ca25e9c62 (reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents: 17124
diff changeset
1271 /* 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
1272 before other buffers. */
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49444
diff changeset
1273
22189
2a61a0a3a9be (Fother_buffer): New arg FRAME. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents: 22171
diff changeset
1274 tem = frame_buffer_list (frame);
17218
a57ca25e9c62 (reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents: 17124
diff changeset
1275 add_ons = Qnil;
a57ca25e9c62 (reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents: 17124
diff changeset
1276 while (CONSP (tem))
a57ca25e9c62 (reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents: 17124
diff changeset
1277 {
26164
d39ec0a27081 more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents: 26088
diff changeset
1278 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
1279 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
1280 tem = XCDR (tem);
17218
a57ca25e9c62 (reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents: 17124
diff changeset
1281 }
a57ca25e9c62 (reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents: 17124
diff changeset
1282 tail = nconc2 (Fnreverse (add_ons), tail);
a57ca25e9c62 (reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents: 17124
diff changeset
1283
47972
287494c5e770 (assoc_ignore_text_properties, Fother_buffer, Fkill_buffer)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 46920
diff changeset
1284 for (; CONSP (tail); tail = XCDR (tail))
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1285 {
47972
287494c5e770 (assoc_ignore_text_properties, Fother_buffer, Fkill_buffer)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 46920
diff changeset
1286 buf = Fcdr (XCAR (tail));
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1287 if (EQ (buf, buffer))
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1288 continue;
53350
89a24e997838 (Fother_buffer): Don't crash if BUF is nil
Richard M. Stallman <rms@gnu.org>
parents: 52459
diff changeset
1289 if (NILP (buf))
89a24e997838 (Fother_buffer): Don't crash if BUF is nil
Richard M. Stallman <rms@gnu.org>
parents: 52459
diff changeset
1290 continue;
89a24e997838 (Fother_buffer): Don't crash if BUF is nil
Richard M. Stallman <rms@gnu.org>
parents: 52459
diff changeset
1291 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
1292 continue;
46419
46ff766afaaf * buffer.c (Fother_buffer): Use SREF when retrieving a byte from
Ken Raeburn <raeburn@raeburn.org>
parents: 46378
diff changeset
1293 if (SREF (XBUFFER (buf)->name, 0) == ' ')
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1294 continue;
10210
43e95429ffa0 (Fget_buffer_create): Copy the name, and clear text props.
Richard M. Stallman <rms@gnu.org>
parents: 10146
diff changeset
1295 /* 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
1296 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
1297 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
1298 {
17218
a57ca25e9c62 (reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents: 17124
diff changeset
1299 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
1300 if (NILP (tem))
43e95429ffa0 (Fget_buffer_create): Copy the name, and clear text props.
Richard M. Stallman <rms@gnu.org>
parents: 10146
diff changeset
1301 continue;
43e95429ffa0 (Fget_buffer_create): Copy the name, and clear text props.
Richard M. Stallman <rms@gnu.org>
parents: 10146
diff changeset
1302 }
43e95429ffa0 (Fget_buffer_create): Copy the name, and clear text props.
Richard M. Stallman <rms@gnu.org>
parents: 10146
diff changeset
1303
1281
1f6cfa3ea4cb * buffer.c (Fother_buffer): Add back the VISIBLE_OK argument. It
Jim Blandy <jimb@redhat.com>
parents: 1253
diff changeset
1304 if (NILP (visible_ok))
31395
d0f522cf422b (Fother_buffer): Consider buffers as invisible when
Gerd Moellmann <gerd@gnu.org>
parents: 31128
diff changeset
1305 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
1306 else
1f6cfa3ea4cb * buffer.c (Fother_buffer): Add back the VISIBLE_OK argument. It
Jim Blandy <jimb@redhat.com>
parents: 1253
diff changeset
1307 tem = Qnil;
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 392
diff changeset
1308 if (NILP (tem))
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1309 return buf;
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 392
diff changeset
1310 if (NILP (notsogood))
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1311 notsogood = buf;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1312 }
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 392
diff changeset
1313 if (!NILP (notsogood))
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1314 return notsogood;
27480
90165d2202f9 (Fother_buffer): Don't call Fset_buffer_major_mode
Gerd Moellmann <gerd@gnu.org>
parents: 27012
diff changeset
1315 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
1316 if (NILP (buf))
90165d2202f9 (Fother_buffer): Don't call Fset_buffer_major_mode
Gerd Moellmann <gerd@gnu.org>
parents: 27012
diff changeset
1317 {
90165d2202f9 (Fother_buffer): Don't call Fset_buffer_major_mode
Gerd Moellmann <gerd@gnu.org>
parents: 27012
diff changeset
1318 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
1319 Fset_buffer_major_mode (buf);
90165d2202f9 (Fother_buffer): Don't call Fset_buffer_major_mode
Gerd Moellmann <gerd@gnu.org>
parents: 27012
diff changeset
1320 }
14226
ad275aca6fc5 (Fother_buffer): If we have to create a new buffer, use
Karl Heuer <kwzh@gnu.org>
parents: 14186
diff changeset
1321 return buf;
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1322 }
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1323
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1324 DEFUN ("buffer-enable-undo", Fbuffer_enable_undo, Sbuffer_enable_undo,
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1325 0, 1, "",
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39974
diff changeset
1326 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
1327 No argument or nil as argument means do this for the current buffer. */)
109179
8cfee7d2955f Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109165
diff changeset
1328 (register Lisp_Object buffer)
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1329 {
648
70b112526394 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 585
diff changeset
1330 Lisp_Object real_buffer;
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1331
648
70b112526394 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 585
diff changeset
1332 if (NILP (buffer))
9262
582534b6e763 (Fget_buffer_create, Frename_buffer, Fbuffer_disable_undo,
Karl Heuer <kwzh@gnu.org>
parents: 9211
diff changeset
1333 XSETBUFFER (real_buffer, current_buffer);
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1334 else
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1335 {
648
70b112526394 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 585
diff changeset
1336 real_buffer = Fget_buffer (buffer);
70b112526394 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 585
diff changeset
1337 if (NILP (real_buffer))
70b112526394 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 585
diff changeset
1338 nsberror (buffer);
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1339 }
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1340
648
70b112526394 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 585
diff changeset
1341 if (EQ (XBUFFER (real_buffer)->undo_list, Qt))
70b112526394 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 585
diff changeset
1342 XBUFFER (real_buffer)->undo_list = Qnil;
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1343
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1344 return Qnil;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1345 }
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1346
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1347 /*
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1348 DEFVAR_LISP ("kill-buffer-hook", no_cell, "\
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1349 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
1350 The buffer being killed will be current while the hook is running.\n\
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1351 See `kill-buffer'."
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1352 */
98982
7ccc521ae6b1 (Fget_buffer, Fbury_buffer, switch_to_buffer_1):
Martin Rudalics <rudalics@gmx.at>
parents: 98732
diff changeset
1353 DEFUN ("kill-buffer", Fkill_buffer, Skill_buffer, 0, 1, "bKill buffer: ",
7ccc521ae6b1 (Fget_buffer, Fbury_buffer, switch_to_buffer_1):
Martin Rudalics <rudalics@gmx.at>
parents: 98732
diff changeset
1354 doc: /* Kill buffer BUFFER-OR-NAME.
7ccc521ae6b1 (Fget_buffer, Fbury_buffer, switch_to_buffer_1):
Martin Rudalics <rudalics@gmx.at>
parents: 98732
diff changeset
1355 The argument may be a buffer or the name of an existing buffer.
7ccc521ae6b1 (Fget_buffer, Fbury_buffer, switch_to_buffer_1):
Martin Rudalics <rudalics@gmx.at>
parents: 98732
diff changeset
1356 Argument nil or omitted means kill the current buffer. Return t if the
7ccc521ae6b1 (Fget_buffer, Fbury_buffer, switch_to_buffer_1):
Martin Rudalics <rudalics@gmx.at>
parents: 98732
diff changeset
1357 buffer is actually killed, nil otherwise.
7ccc521ae6b1 (Fget_buffer, Fbury_buffer, switch_to_buffer_1):
Martin Rudalics <rudalics@gmx.at>
parents: 98732
diff changeset
1358
7ccc521ae6b1 (Fget_buffer, Fbury_buffer, switch_to_buffer_1):
Martin Rudalics <rudalics@gmx.at>
parents: 98732
diff changeset
1359 This function calls `replace-buffer-in-windows' for cleaning up all
7ccc521ae6b1 (Fget_buffer, Fbury_buffer, switch_to_buffer_1):
Martin Rudalics <rudalics@gmx.at>
parents: 98732
diff changeset
1360 windows currently displaying the buffer to be killed. The functions in
7ccc521ae6b1 (Fget_buffer, Fbury_buffer, switch_to_buffer_1):
Martin Rudalics <rudalics@gmx.at>
parents: 98732
diff changeset
1361 `kill-buffer-query-functions' are called with the buffer to be killed as
7ccc521ae6b1 (Fget_buffer, Fbury_buffer, switch_to_buffer_1):
Martin Rudalics <rudalics@gmx.at>
parents: 98732
diff changeset
1362 the current buffer. If any of them returns nil, the buffer is not
7ccc521ae6b1 (Fget_buffer, Fbury_buffer, switch_to_buffer_1):
Martin Rudalics <rudalics@gmx.at>
parents: 98732
diff changeset
1363 killed. The hook `kill-buffer-hook' is run before the buffer is
7ccc521ae6b1 (Fget_buffer, Fbury_buffer, switch_to_buffer_1):
Martin Rudalics <rudalics@gmx.at>
parents: 98732
diff changeset
1364 actually killed. The buffer being killed will be current while the hook
7ccc521ae6b1 (Fget_buffer, Fbury_buffer, switch_to_buffer_1):
Martin Rudalics <rudalics@gmx.at>
parents: 98732
diff changeset
1365 is running.
39971
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
1366
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
1367 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
1368 with SIGHUP. */)
109179
8cfee7d2955f Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109165
diff changeset
1369 (Lisp_Object buffer_or_name)
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1370 {
98982
7ccc521ae6b1 (Fget_buffer, Fbury_buffer, switch_to_buffer_1):
Martin Rudalics <rudalics@gmx.at>
parents: 98732
diff changeset
1371 Lisp_Object buffer;
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1372 register struct buffer *b;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1373 register Lisp_Object tem;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1374 register struct Lisp_Marker *m;
25744
8b89b961f7d1 (Fkill_buffer): Remove unused variables.
Gerd Moellmann <gerd@gnu.org>
parents: 25664
diff changeset
1375 struct gcpro gcpro1;
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1376
98982
7ccc521ae6b1 (Fget_buffer, Fbury_buffer, switch_to_buffer_1):
Martin Rudalics <rudalics@gmx.at>
parents: 98732
diff changeset
1377 if (NILP (buffer_or_name))
7ccc521ae6b1 (Fget_buffer, Fbury_buffer, switch_to_buffer_1):
Martin Rudalics <rudalics@gmx.at>
parents: 98732
diff changeset
1378 buffer = Fcurrent_buffer ();
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1379 else
98982
7ccc521ae6b1 (Fget_buffer, Fbury_buffer, switch_to_buffer_1):
Martin Rudalics <rudalics@gmx.at>
parents: 98732
diff changeset
1380 buffer = Fget_buffer (buffer_or_name);
7ccc521ae6b1 (Fget_buffer, Fbury_buffer, switch_to_buffer_1):
Martin Rudalics <rudalics@gmx.at>
parents: 98732
diff changeset
1381 if (NILP (buffer))
7ccc521ae6b1 (Fget_buffer, Fbury_buffer, switch_to_buffer_1):
Martin Rudalics <rudalics@gmx.at>
parents: 98732
diff changeset
1382 nsberror (buffer_or_name);
7ccc521ae6b1 (Fget_buffer, Fbury_buffer, switch_to_buffer_1):
Martin Rudalics <rudalics@gmx.at>
parents: 98732
diff changeset
1383
7ccc521ae6b1 (Fget_buffer, Fbury_buffer, switch_to_buffer_1):
Martin Rudalics <rudalics@gmx.at>
parents: 98732
diff changeset
1384 b = XBUFFER (buffer);
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1385
12076
ee38e93ccf7e (Fkill_buffer): When killing indirect buffer,
Karl Heuer <kwzh@gnu.org>
parents: 11889
diff changeset
1386 /* Avoid trouble for buffer already dead. */
ee38e93ccf7e (Fkill_buffer): When killing indirect buffer,
Karl Heuer <kwzh@gnu.org>
parents: 11889
diff changeset
1387 if (NILP (b->name))
ee38e93ccf7e (Fkill_buffer): When killing indirect buffer,
Karl Heuer <kwzh@gnu.org>
parents: 11889
diff changeset
1388 return Qnil;
ee38e93ccf7e (Fkill_buffer): When killing indirect buffer,
Karl Heuer <kwzh@gnu.org>
parents: 11889
diff changeset
1389
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1390 /* Query if the buffer is still modified. */
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 392
diff changeset
1391 if (INTERACTIVE && !NILP (b->filename)
10314
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1392 && BUF_MODIFF (b) > BUF_SAVE_MODIFF (b))
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1393 {
98982
7ccc521ae6b1 (Fget_buffer, Fbury_buffer, switch_to_buffer_1):
Martin Rudalics <rudalics@gmx.at>
parents: 98732
diff changeset
1394 GCPRO1 (buffer);
49444
a80513b20297 (Fkill_buffer): Call format2 instead of format1.
Richard M. Stallman <rms@gnu.org>
parents: 49057
diff changeset
1395 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
1396 b->name, make_number (0)));
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1397 UNGCPRO;
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 392
diff changeset
1398 if (NILP (tem))
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1399 return Qnil;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1400 }
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1401
6051
0b144d967f30 (Fkill_buffer): Call the Vkill_buffer_query_functions.
Richard M. Stallman <rms@gnu.org>
parents: 5904
diff changeset
1402 /* Run hooks with the buffer to be killed the current buffer. */
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1403 {
46293
1fb8f75062c6 Use macro SPECPDL_INDEX.
Juanma Barranquero <lekktu@gmail.com>
parents: 46199
diff changeset
1404 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
1405 Lisp_Object arglist[1];
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1406
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1407 record_unwind_protect (save_excursion_restore, save_excursion_save ());
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1408 set_buffer_internal (b);
6051
0b144d967f30 (Fkill_buffer): Call the Vkill_buffer_query_functions.
Richard M. Stallman <rms@gnu.org>
parents: 5904
diff changeset
1409
0b144d967f30 (Fkill_buffer): Call the Vkill_buffer_query_functions.
Richard M. Stallman <rms@gnu.org>
parents: 5904
diff changeset
1410 /* 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
1411 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
1412 arglist[0] = Qkill_buffer_query_functions;
67335
a4a1c5b73301 (Fkill_buffer): Avoid dangerous side effects in NILP argument.
Ken Raeburn <raeburn@raeburn.org>
parents: 67220
diff changeset
1413 tem = Frun_hook_with_args_until_failure (1, arglist);
a4a1c5b73301 (Fkill_buffer): Avoid dangerous side effects in NILP argument.
Ken Raeburn <raeburn@raeburn.org>
parents: 67220
diff changeset
1414 if (NILP (tem))
50014
3b2576528809 (Fkill_buffer): Use Frun_hook_with_args_until_failure
Richard M. Stallman <rms@gnu.org>
parents: 49974
diff changeset
1415 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
1416
0b144d967f30 (Fkill_buffer): Call the Vkill_buffer_query_functions.
Richard M. Stallman <rms@gnu.org>
parents: 5904
diff changeset
1417 /* Then run the hooks. */
41524
095a45698793 (Fkill_buffer): Use Frun_hooks, not Vrun_hooks.
Richard M. Stallman <rms@gnu.org>
parents: 41027
diff changeset
1418 Frun_hooks (1, &Qkill_buffer_hook);
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1419 unbind_to (count, Qnil);
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1420 }
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1421
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1422 /* We have no more questions to ask. Verify that it is valid
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1423 to kill the buffer. This must be done after the questions
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1424 since anything can happen within do_yes_or_no_p. */
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1425
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1426 /* Don't kill the minibuffer now current. */
98982
7ccc521ae6b1 (Fget_buffer, Fbury_buffer, switch_to_buffer_1):
Martin Rudalics <rudalics@gmx.at>
parents: 98732
diff changeset
1427 if (EQ (buffer, XWINDOW (minibuf_window)->buffer))
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1428 return Qnil;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1429
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 392
diff changeset
1430 if (NILP (b->name))
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1431 return Qnil;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1432
10314
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1433 /* 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
1434 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
1435 ask questions or their hooks get errors. */
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1436 if (! b->base_buffer)
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1437 {
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1438 struct buffer *other;
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1439
98982
7ccc521ae6b1 (Fget_buffer, Fbury_buffer, switch_to_buffer_1):
Martin Rudalics <rudalics@gmx.at>
parents: 98732
diff changeset
1440 GCPRO1 (buffer);
10314
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1441
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1442 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
1443 /* all_buffers contains dead buffers too;
ee38e93ccf7e (Fkill_buffer): When killing indirect buffer,
Karl Heuer <kwzh@gnu.org>
parents: 11889
diff changeset
1444 don't re-kill them. */
ee38e93ccf7e (Fkill_buffer): When killing indirect buffer,
Karl Heuer <kwzh@gnu.org>
parents: 11889
diff changeset
1445 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
1446 {
98982
7ccc521ae6b1 (Fget_buffer, Fbury_buffer, switch_to_buffer_1):
Martin Rudalics <rudalics@gmx.at>
parents: 98732
diff changeset
1447 Lisp_Object buffer;
7ccc521ae6b1 (Fget_buffer, Fbury_buffer, switch_to_buffer_1):
Martin Rudalics <rudalics@gmx.at>
parents: 98732
diff changeset
1448 XSETBUFFER (buffer, other);
7ccc521ae6b1 (Fget_buffer, Fbury_buffer, switch_to_buffer_1):
Martin Rudalics <rudalics@gmx.at>
parents: 98732
diff changeset
1449 Fkill_buffer (buffer);
10314
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1450 }
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1451
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1452 UNGCPRO;
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1453 }
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49444
diff changeset
1454
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1455 /* Make this buffer not be current.
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1456 In the process, notice if this is the sole visible buffer
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1457 and give up if so. */
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1458 if (b == current_buffer)
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1459 {
98982
7ccc521ae6b1 (Fget_buffer, Fbury_buffer, switch_to_buffer_1):
Martin Rudalics <rudalics@gmx.at>
parents: 98732
diff changeset
1460 tem = Fother_buffer (buffer, Qnil, Qnil);
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1461 Fset_buffer (tem);
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1462 if (b == current_buffer)
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1463 return Qnil;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1464 }
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1465
33698
6864fead9622 (Fkill_buffer): Notice if the buffer to kill is the
Gerd Moellmann <gerd@gnu.org>
parents: 33675
diff changeset
1466 /* 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
1467 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
1468 XSETBUFFER (tem, current_buffer);
6864fead9622 (Fkill_buffer): Notice if the buffer to kill is the
Gerd Moellmann <gerd@gnu.org>
parents: 33675
diff changeset
1469 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
1470 {
98982
7ccc521ae6b1 (Fget_buffer, Fbury_buffer, switch_to_buffer_1):
Martin Rudalics <rudalics@gmx.at>
parents: 98732
diff changeset
1471 tem = Fother_buffer (buffer, Qnil, Qnil);
7ccc521ae6b1 (Fget_buffer, Fbury_buffer, switch_to_buffer_1):
Martin Rudalics <rudalics@gmx.at>
parents: 98732
diff changeset
1472 if (EQ (buffer, tem))
33698
6864fead9622 (Fkill_buffer): Notice if the buffer to kill is the
Gerd Moellmann <gerd@gnu.org>
parents: 33675
diff changeset
1473 return Qnil;
6864fead9622 (Fkill_buffer): Notice if the buffer to kill is the
Gerd Moellmann <gerd@gnu.org>
parents: 33675
diff changeset
1474 }
6864fead9622 (Fkill_buffer): Notice if the buffer to kill is the
Gerd Moellmann <gerd@gnu.org>
parents: 33675
diff changeset
1475
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1476 /* Now there is no question: we can kill the buffer. */
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1477
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1478 #ifdef CLASH_DETECTION
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1479 /* Unlock this buffer's file, if it is locked. */
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1480 unlock_buffer (b);
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1481 #endif /* CLASH_DETECTION */
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1482
98982
7ccc521ae6b1 (Fget_buffer, Fbury_buffer, switch_to_buffer_1):
Martin Rudalics <rudalics@gmx.at>
parents: 98732
diff changeset
1483 GCPRO1 (buffer);
7ccc521ae6b1 (Fget_buffer, Fbury_buffer, switch_to_buffer_1):
Martin Rudalics <rudalics@gmx.at>
parents: 98732
diff changeset
1484 kill_buffer_processes (buffer);
77176
421b3f5480da (Fkill_buffer): gcpro BUF during kill_buffer_processes
Kim F. Storm <storm@cua.dk>
parents: 76791
diff changeset
1485 UNGCPRO;
421b3f5480da (Fkill_buffer): gcpro BUF during kill_buffer_processes
Kim F. Storm <storm@cua.dk>
parents: 76791
diff changeset
1486
421b3f5480da (Fkill_buffer): gcpro BUF during kill_buffer_processes
Kim F. Storm <storm@cua.dk>
parents: 76791
diff changeset
1487 /* Killing buffer processes may run sentinels which may
421b3f5480da (Fkill_buffer): gcpro BUF during kill_buffer_processes
Kim F. Storm <storm@cua.dk>
parents: 76791
diff changeset
1488 have called kill-buffer. */
421b3f5480da (Fkill_buffer): gcpro BUF during kill_buffer_processes
Kim F. Storm <storm@cua.dk>
parents: 76791
diff changeset
1489
421b3f5480da (Fkill_buffer): gcpro BUF during kill_buffer_processes
Kim F. Storm <storm@cua.dk>
parents: 76791
diff changeset
1490 if (NILP (b->name))
421b3f5480da (Fkill_buffer): gcpro BUF during kill_buffer_processes
Kim F. Storm <storm@cua.dk>
parents: 76791
diff changeset
1491 return Qnil;
421b3f5480da (Fkill_buffer): gcpro BUF during kill_buffer_processes
Kim F. Storm <storm@cua.dk>
parents: 76791
diff changeset
1492
51782
3b58843e8f3f (Fkill_buffer): Clear charpos cache if necessary.
Kenichi Handa <handa@m17n.org>
parents: 51669
diff changeset
1493 clear_charpos_cache (b);
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1494
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1495 tem = Vinhibit_quit;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1496 Vinhibit_quit = Qt;
98982
7ccc521ae6b1 (Fget_buffer, Fbury_buffer, switch_to_buffer_1):
Martin Rudalics <rudalics@gmx.at>
parents: 98732
diff changeset
1497 replace_buffer_in_all_windows (buffer);
7ccc521ae6b1 (Fget_buffer, Fbury_buffer, switch_to_buffer_1):
Martin Rudalics <rudalics@gmx.at>
parents: 98732
diff changeset
1498 Vbuffer_alist = Fdelq (Frassq (buffer, Vbuffer_alist), Vbuffer_alist);
7ccc521ae6b1 (Fget_buffer, Fbury_buffer, switch_to_buffer_1):
Martin Rudalics <rudalics@gmx.at>
parents: 98732
diff changeset
1499 frames_discard_buffer (buffer);
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1500 Vinhibit_quit = tem;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1501
40760
aa9b081b3a0d (Fkill_buffer): Don't delete auto save file if buffer is modified.
Richard M. Stallman <rms@gnu.org>
parents: 40735
diff changeset
1502 /* 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
1503 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
1504 if (STRINGP (b->auto_save_file_name)
106813
4040ecb0c904 Try to fix bug#5314. This is probably not the final word, tho.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106185
diff changeset
1505 && BUF_AUTOSAVE_MODIFF (b) != 0
4040ecb0c904 Try to fix bug#5314. This is probably not the final word, tho.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106185
diff changeset
1506 && BUF_SAVE_MODIFF (b) < BUF_AUTOSAVE_MODIFF (b)
53350
89a24e997838 (Fother_buffer): Don't crash if BUF is nil
Richard M. Stallman <rms@gnu.org>
parents: 52459
diff changeset
1507 && 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
1508 && NILP (Fsymbol_value (intern ("auto-save-visited-file-name"))))
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1509 {
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1510 Lisp_Object tem;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1511 tem = Fsymbol_value (intern ("delete-auto-save-files"));
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 392
diff changeset
1512 if (! NILP (tem))
10082
8d3a71736423 (Fkill_buffer): Use internal_delete_file.
Richard M. Stallman <rms@gnu.org>
parents: 9950
diff changeset
1513 internal_delete_file (b->auto_save_file_name);
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1514 }
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1515
12076
ee38e93ccf7e (Fkill_buffer): When killing indirect buffer,
Karl Heuer <kwzh@gnu.org>
parents: 11889
diff changeset
1516 if (b->base_buffer)
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1517 {
12076
ee38e93ccf7e (Fkill_buffer): When killing indirect buffer,
Karl Heuer <kwzh@gnu.org>
parents: 11889
diff changeset
1518 /* 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
1519 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
1520 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
1521 for (m = BUF_MARKERS (b); m; )
12076
ee38e93ccf7e (Fkill_buffer): When killing indirect buffer,
Karl Heuer <kwzh@gnu.org>
parents: 11889
diff changeset
1522 {
51669
f3dc77591fe2 (set_buffer_internal_1): Test CONSP for lists.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51431
diff changeset
1523 struct Lisp_Marker *next = m->next;
12076
ee38e93ccf7e (Fkill_buffer): When killing indirect buffer,
Karl Heuer <kwzh@gnu.org>
parents: 11889
diff changeset
1524 if (m->buffer == b)
51669
f3dc77591fe2 (set_buffer_internal_1): Test CONSP for lists.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51431
diff changeset
1525 unchain_marker (m);
f3dc77591fe2 (set_buffer_internal_1): Test CONSP for lists.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51431
diff changeset
1526 m = next;
12076
ee38e93ccf7e (Fkill_buffer): When killing indirect buffer,
Karl Heuer <kwzh@gnu.org>
parents: 11889
diff changeset
1527 }
ee38e93ccf7e (Fkill_buffer): When killing indirect buffer,
Karl Heuer <kwzh@gnu.org>
parents: 11889
diff changeset
1528 }
ee38e93ccf7e (Fkill_buffer): When killing indirect buffer,
Karl Heuer <kwzh@gnu.org>
parents: 11889
diff changeset
1529 else
ee38e93ccf7e (Fkill_buffer): When killing indirect buffer,
Karl Heuer <kwzh@gnu.org>
parents: 11889
diff changeset
1530 {
ee38e93ccf7e (Fkill_buffer): When killing indirect buffer,
Karl Heuer <kwzh@gnu.org>
parents: 11889
diff changeset
1531 /* 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
1532 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
1533 for (m = BUF_MARKERS (b); m; )
10314
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1534 {
51669
f3dc77591fe2 (set_buffer_internal_1): Test CONSP for lists.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51431
diff changeset
1535 struct Lisp_Marker *next = m->next;
10314
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1536 m->buffer = 0;
51669
f3dc77591fe2 (set_buffer_internal_1): Test CONSP for lists.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51431
diff changeset
1537 m->next = NULL;
f3dc77591fe2 (set_buffer_internal_1): Test CONSP for lists.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51431
diff changeset
1538 m = next;
10314
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1539 }
51669
f3dc77591fe2 (set_buffer_internal_1): Test CONSP for lists.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51431
diff changeset
1540 BUF_MARKERS (b) = NULL;
10314
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1541 BUF_INTERVALS (b) = NULL_INTERVAL;
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1542
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1543 /* Perhaps we should explicitly free the interval tree here... */
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1544 }
1291
7c32612174c3 * buffer.c (reset_buffer): Do INITIALIZE_INTERVAL on the buffer's
Joseph Arceneaux <jla@gnu.org>
parents: 1281
diff changeset
1545
11214
b880572ce431 (Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents: 11112
diff changeset
1546 /* 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
1547 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
1548 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
1549 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
1550 swap_out_buffer_local_variables (b);
15776
6018e01d4466 (buffer_permanent_local_flags): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 15638
diff changeset
1551 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
1552
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1553 b->name = Qnil;
10314
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1554
2439
b6c62e4abf59 Put interrupt input blocking in a separate file from xterm.h.
Jim Blandy <jimb@redhat.com>
parents: 2389
diff changeset
1555 BLOCK_INPUT;
10314
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1556 if (! b->base_buffer)
31604
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
1557 free_buffer_text (b);
10314
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1558
9403
9f797989b817 * buffer.c: #include region-cache.h.
Jim Blandy <jimb@redhat.com>
parents: 9362
diff changeset
1559 if (b->newline_cache)
9f797989b817 * buffer.c: #include region-cache.h.
Jim Blandy <jimb@redhat.com>
parents: 9362
diff changeset
1560 {
9f797989b817 * buffer.c: #include region-cache.h.
Jim Blandy <jimb@redhat.com>
parents: 9362
diff changeset
1561 free_region_cache (b->newline_cache);
9f797989b817 * buffer.c: #include region-cache.h.
Jim Blandy <jimb@redhat.com>
parents: 9362
diff changeset
1562 b->newline_cache = 0;
9f797989b817 * buffer.c: #include region-cache.h.
Jim Blandy <jimb@redhat.com>
parents: 9362
diff changeset
1563 }
9f797989b817 * buffer.c: #include region-cache.h.
Jim Blandy <jimb@redhat.com>
parents: 9362
diff changeset
1564 if (b->width_run_cache)
9f797989b817 * buffer.c: #include region-cache.h.
Jim Blandy <jimb@redhat.com>
parents: 9362
diff changeset
1565 {
9f797989b817 * buffer.c: #include region-cache.h.
Jim Blandy <jimb@redhat.com>
parents: 9362
diff changeset
1566 free_region_cache (b->width_run_cache);
9f797989b817 * buffer.c: #include region-cache.h.
Jim Blandy <jimb@redhat.com>
parents: 9362
diff changeset
1567 b->width_run_cache = 0;
9f797989b817 * buffer.c: #include region-cache.h.
Jim Blandy <jimb@redhat.com>
parents: 9362
diff changeset
1568 }
9f797989b817 * buffer.c: #include region-cache.h.
Jim Blandy <jimb@redhat.com>
parents: 9362
diff changeset
1569 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
1570 UNBLOCK_INPUT;
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1571 b->undo_list = Qnil;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1572
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1573 return Qt;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1574 }
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1575
550
3072b38789a7 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 485
diff changeset
1576 /* 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
1577 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
1578 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
1579 means that other_buffer is more likely to choose a relevant buffer. */
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1580
20368
9f5fab56f4b3 (nsberror, record_buffer, validate_region,
Kenichi Handa <handa@m17n.org>
parents: 20186
diff changeset
1581 void
109144
7dceae91724c Convert most remaining function definitions to standard C.
Juanma Barranquero <lekktu@gmail.com>
parents: 109100
diff changeset
1582 record_buffer (Lisp_Object buf)
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1583 {
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1584 register Lisp_Object link, prev;
22189
2a61a0a3a9be (Fother_buffer): New arg FRAME. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents: 22171
diff changeset
1585 Lisp_Object frame;
25664
832aeb9c3996 (Fother_buffer): Change for Lisp_Object selected_frame.
Gerd Moellmann <gerd@gnu.org>
parents: 25653
diff changeset
1586 frame = selected_frame;
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1587
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1588 prev = Qnil;
26164
d39ec0a27081 more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents: 26088
diff changeset
1589 for (link = Vbuffer_alist; CONSP (link); link = XCDR (link))
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1590 {
26164
d39ec0a27081 more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents: 26088
diff changeset
1591 if (EQ (XCDR (XCAR (link)), buf))
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1592 break;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1593 prev = link;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1594 }
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1595
550
3072b38789a7 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 485
diff changeset
1596 /* Effectively do Vbuffer_alist = Fdelq (link, Vbuffer_alist);
3072b38789a7 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 485
diff changeset
1597 we cannot use Fdelq itself here because it allows quitting. */
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1598
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 392
diff changeset
1599 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
1600 Vbuffer_alist = XCDR (Vbuffer_alist);
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1601 else
39973
579177964efa Avoid (most) uses of XCAR/XCDR as lvalues, for flexibility in experimenting
Ken Raeburn <raeburn@raeburn.org>
parents: 39971
diff changeset
1602 XSETCDR (prev, XCDR (XCDR (prev)));
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49444
diff changeset
1603
39973
579177964efa Avoid (most) uses of XCAR/XCDR as lvalues, for flexibility in experimenting
Ken Raeburn <raeburn@raeburn.org>
parents: 39971
diff changeset
1604 XSETCDR (link, Vbuffer_alist);
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1605 Vbuffer_alist = link;
17218
a57ca25e9c62 (reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents: 17124
diff changeset
1606
83415
d2c799f58129 Implement full support for frame-local `next-buffer' and `previous-buffer'.
Karoly Lorentey <lorentey@elte.hu>
parents: 83407
diff changeset
1607 /* Effectively do a delq on buried_buffer_list. */
92975
ca18807830f1 (overlays_in, Foverlays_in): Include empty overlays
Martin Rudalics <rudalics@gmx.at>
parents: 92767
diff changeset
1608
83415
d2c799f58129 Implement full support for frame-local `next-buffer' and `previous-buffer'.
Karoly Lorentey <lorentey@elte.hu>
parents: 83407
diff changeset
1609 prev = Qnil;
d2c799f58129 Implement full support for frame-local `next-buffer' and `previous-buffer'.
Karoly Lorentey <lorentey@elte.hu>
parents: 83407
diff changeset
1610 for (link = XFRAME (frame)->buried_buffer_list; CONSP (link);
d2c799f58129 Implement full support for frame-local `next-buffer' and `previous-buffer'.
Karoly Lorentey <lorentey@elte.hu>
parents: 83407
diff changeset
1611 link = XCDR (link))
d2c799f58129 Implement full support for frame-local `next-buffer' and `previous-buffer'.
Karoly Lorentey <lorentey@elte.hu>
parents: 83407
diff changeset
1612 {
d2c799f58129 Implement full support for frame-local `next-buffer' and `previous-buffer'.
Karoly Lorentey <lorentey@elte.hu>
parents: 83407
diff changeset
1613 if (EQ (XCAR (link), buf))
d2c799f58129 Implement full support for frame-local `next-buffer' and `previous-buffer'.
Karoly Lorentey <lorentey@elte.hu>
parents: 83407
diff changeset
1614 {
d2c799f58129 Implement full support for frame-local `next-buffer' and `previous-buffer'.
Karoly Lorentey <lorentey@elte.hu>
parents: 83407
diff changeset
1615 if (NILP (prev))
d2c799f58129 Implement full support for frame-local `next-buffer' and `previous-buffer'.
Karoly Lorentey <lorentey@elte.hu>
parents: 83407
diff changeset
1616 XFRAME (frame)->buried_buffer_list = XCDR (link);
d2c799f58129 Implement full support for frame-local `next-buffer' and `previous-buffer'.
Karoly Lorentey <lorentey@elte.hu>
parents: 83407
diff changeset
1617 else
d2c799f58129 Implement full support for frame-local `next-buffer' and `previous-buffer'.
Karoly Lorentey <lorentey@elte.hu>
parents: 83407
diff changeset
1618 XSETCDR (prev, XCDR (XCDR (prev)));
d2c799f58129 Implement full support for frame-local `next-buffer' and `previous-buffer'.
Karoly Lorentey <lorentey@elte.hu>
parents: 83407
diff changeset
1619 break;
d2c799f58129 Implement full support for frame-local `next-buffer' and `previous-buffer'.
Karoly Lorentey <lorentey@elte.hu>
parents: 83407
diff changeset
1620 }
d2c799f58129 Implement full support for frame-local `next-buffer' and `previous-buffer'.
Karoly Lorentey <lorentey@elte.hu>
parents: 83407
diff changeset
1621 prev = link;
d2c799f58129 Implement full support for frame-local `next-buffer' and `previous-buffer'.
Karoly Lorentey <lorentey@elte.hu>
parents: 83407
diff changeset
1622 }
d2c799f58129 Implement full support for frame-local `next-buffer' and `previous-buffer'.
Karoly Lorentey <lorentey@elte.hu>
parents: 83407
diff changeset
1623
17218
a57ca25e9c62 (reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents: 17124
diff changeset
1624 /* 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
1625
a57ca25e9c62 (reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents: 17124
diff changeset
1626 prev = Qnil;
22189
2a61a0a3a9be (Fother_buffer): New arg FRAME. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents: 22171
diff changeset
1627 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
1628 link = XCDR (link))
17218
a57ca25e9c62 (reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents: 17124
diff changeset
1629 {
26164
d39ec0a27081 more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents: 26088
diff changeset
1630 if (EQ (XCAR (link), buf))
17218
a57ca25e9c62 (reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents: 17124
diff changeset
1631 break;
a57ca25e9c62 (reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents: 17124
diff changeset
1632 prev = link;
a57ca25e9c62 (reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents: 17124
diff changeset
1633 }
a57ca25e9c62 (reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents: 17124
diff changeset
1634
a57ca25e9c62 (reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents: 17124
diff changeset
1635 /* Effectively do delq. */
a57ca25e9c62 (reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents: 17124
diff changeset
1636
a57ca25e9c62 (reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents: 17124
diff changeset
1637 if (CONSP (link))
a57ca25e9c62 (reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents: 17124
diff changeset
1638 {
a57ca25e9c62 (reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents: 17124
diff changeset
1639 if (NILP (prev))
22189
2a61a0a3a9be (Fother_buffer): New arg FRAME. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents: 22171
diff changeset
1640 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
1641 XCDR (frame_buffer_list (frame)));
17218
a57ca25e9c62 (reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents: 17124
diff changeset
1642 else
39973
579177964efa Avoid (most) uses of XCAR/XCDR as lvalues, for flexibility in experimenting
Ken Raeburn <raeburn@raeburn.org>
parents: 39971
diff changeset
1643 XSETCDR (prev, XCDR (XCDR (prev)));
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49444
diff changeset
1644
39973
579177964efa Avoid (most) uses of XCAR/XCDR as lvalues, for flexibility in experimenting
Ken Raeburn <raeburn@raeburn.org>
parents: 39971
diff changeset
1645 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
1646 set_frame_buffer_list (frame, link);
17218
a57ca25e9c62 (reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents: 17124
diff changeset
1647 }
a57ca25e9c62 (reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents: 17124
diff changeset
1648 else
22189
2a61a0a3a9be (Fother_buffer): New arg FRAME. Calls changed.
Richard M. Stallman <rms@gnu.org>
parents: 22171
diff changeset
1649 set_frame_buffer_list (frame, Fcons (buf, frame_buffer_list (frame)));
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1650 }
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1651
9732
577db538b0b6 (Fset_buffer_major_mode): New function. Set the default major mode here.
Karl Heuer <kwzh@gnu.org>
parents: 9632
diff changeset
1652 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
1653 doc: /* Set an appropriate major mode for BUFFER.
40605
9c8c502c1713 Fix a typo.
Gerd Moellmann <gerd@gnu.org>
parents: 40567
diff changeset
1654 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
1655 according to `default-major-mode'.
39971
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
1656 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
1657 the current buffer's major mode. */)
109179
8cfee7d2955f Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109165
diff changeset
1658 (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
1659 {
577db538b0b6 (Fset_buffer_major_mode): New function. Set the default major mode here.
Karl Heuer <kwzh@gnu.org>
parents: 9632
diff changeset
1660 int count;
577db538b0b6 (Fset_buffer_major_mode): New function. Set the default major mode here.
Karl Heuer <kwzh@gnu.org>
parents: 9632
diff changeset
1661 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
1662
76791
6ef15c3befe4 (Fset_buffer_major_mode): Check that BUFFER is valid.
Juanma Barranquero <lekktu@gmail.com>
parents: 76557
diff changeset
1663 CHECK_BUFFER (buffer);
6ef15c3befe4 (Fset_buffer_major_mode): Check that BUFFER is valid.
Juanma Barranquero <lekktu@gmail.com>
parents: 76557
diff changeset
1664
39974
a72c97b251de (Fset_buffer_major_mode): Use initial-major-mode for
Gerd Moellmann <gerd@gnu.org>
parents: 39973
diff changeset
1665 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
1666 && 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
1667 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
1668 else
a72c97b251de (Fset_buffer_major_mode): Use initial-major-mode for
Gerd Moellmann <gerd@gnu.org>
parents: 39973
diff changeset
1669 {
a72c97b251de (Fset_buffer_major_mode): Use initial-major-mode for
Gerd Moellmann <gerd@gnu.org>
parents: 39973
diff changeset
1670 function = buffer_defaults.major_mode;
a72c97b251de (Fset_buffer_major_mode): Use initial-major-mode for
Gerd Moellmann <gerd@gnu.org>
parents: 39973
diff changeset
1671 if (NILP (function)
a72c97b251de (Fset_buffer_major_mode): Use initial-major-mode for
Gerd Moellmann <gerd@gnu.org>
parents: 39973
diff changeset
1672 && 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
1673 function = current_buffer->major_mode;
a72c97b251de (Fset_buffer_major_mode): Use initial-major-mode for
Gerd Moellmann <gerd@gnu.org>
parents: 39973
diff changeset
1674 }
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49444
diff changeset
1675
48635
2a9a1d761581 (Qucs_set_table_for_input): New.
Dave Love <fx@gnu.org>
parents: 48355
diff changeset
1676 if (NILP (function) || EQ (function, Qfundamental_mode))
2a9a1d761581 (Qucs_set_table_for_input): New.
Dave Love <fx@gnu.org>
parents: 48355
diff changeset
1677 return Qnil;
2a9a1d761581 (Qucs_set_table_for_input): New.
Dave Love <fx@gnu.org>
parents: 48355
diff changeset
1678
46293
1fb8f75062c6 Use macro SPECPDL_INDEX.
Juanma Barranquero <lekktu@gmail.com>
parents: 46199
diff changeset
1679 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
1680
48635
2a9a1d761581 (Qucs_set_table_for_input): New.
Dave Love <fx@gnu.org>
parents: 48355
diff changeset
1681 /* To select a nonfundamental mode,
2a9a1d761581 (Qucs_set_table_for_input): New.
Dave Love <fx@gnu.org>
parents: 48355
diff changeset
1682 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
1683
577db538b0b6 (Fset_buffer_major_mode): New function. Set the default major mode here.
Karl Heuer <kwzh@gnu.org>
parents: 9632
diff changeset
1684 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
1685
14060
b62397f49a24 (Fmake_indirect_buffer, Fset_buffer_major_mode, Fpop_to_buffer,
Erik Naggum <erik@naggum.no>
parents: 13922
diff changeset
1686 Fset_buffer (buffer);
48635
2a9a1d761581 (Qucs_set_table_for_input): New.
Dave Love <fx@gnu.org>
parents: 48355
diff changeset
1687 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
1688
577db538b0b6 (Fset_buffer_major_mode): New function. Set the default major mode here.
Karl Heuer <kwzh@gnu.org>
parents: 9632
diff changeset
1689 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
1690 }
577db538b0b6 (Fset_buffer_major_mode): New function. Set the default major mode here.
Karl Heuer <kwzh@gnu.org>
parents: 9632
diff changeset
1691
25181
847441efad8d (switch_to_buffer_1): New subroutine, taken out from Fswitch_to_buffer.
Richard M. Stallman <rms@gnu.org>
parents: 25021
diff changeset
1692 /* 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
1693 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
1694
847441efad8d (switch_to_buffer_1): New subroutine, taken out from Fswitch_to_buffer.
Richard M. Stallman <rms@gnu.org>
parents: 25021
diff changeset
1695 Lisp_Object
109144
7dceae91724c Convert most remaining function definitions to standard C.
Juanma Barranquero <lekktu@gmail.com>
parents: 109100
diff changeset
1696 switch_to_buffer_1 (Lisp_Object buffer_or_name, Lisp_Object norecord)
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1697 {
98982
7ccc521ae6b1 (Fget_buffer, Fbury_buffer, switch_to_buffer_1):
Martin Rudalics <rudalics@gmx.at>
parents: 98732
diff changeset
1698 register Lisp_Object buffer;
7ccc521ae6b1 (Fget_buffer, Fbury_buffer, switch_to_buffer_1):
Martin Rudalics <rudalics@gmx.at>
parents: 98732
diff changeset
1699
7ccc521ae6b1 (Fget_buffer, Fbury_buffer, switch_to_buffer_1):
Martin Rudalics <rudalics@gmx.at>
parents: 98732
diff changeset
1700 if (NILP (buffer_or_name))
7ccc521ae6b1 (Fget_buffer, Fbury_buffer, switch_to_buffer_1):
Martin Rudalics <rudalics@gmx.at>
parents: 98732
diff changeset
1701 buffer = Fother_buffer (Fcurrent_buffer (), Qnil, Qnil);
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1702 else
9732
577db538b0b6 (Fset_buffer_major_mode): New function. Set the default major mode here.
Karl Heuer <kwzh@gnu.org>
parents: 9632
diff changeset
1703 {
98982
7ccc521ae6b1 (Fget_buffer, Fbury_buffer, switch_to_buffer_1):
Martin Rudalics <rudalics@gmx.at>
parents: 98732
diff changeset
1704 buffer = Fget_buffer (buffer_or_name);
7ccc521ae6b1 (Fget_buffer, Fbury_buffer, switch_to_buffer_1):
Martin Rudalics <rudalics@gmx.at>
parents: 98732
diff changeset
1705 if (NILP (buffer))
9732
577db538b0b6 (Fset_buffer_major_mode): New function. Set the default major mode here.
Karl Heuer <kwzh@gnu.org>
parents: 9632
diff changeset
1706 {
98982
7ccc521ae6b1 (Fget_buffer, Fbury_buffer, switch_to_buffer_1):
Martin Rudalics <rudalics@gmx.at>
parents: 98732
diff changeset
1707 buffer = Fget_buffer_create (buffer_or_name);
7ccc521ae6b1 (Fget_buffer, Fbury_buffer, switch_to_buffer_1):
Martin Rudalics <rudalics@gmx.at>
parents: 98732
diff changeset
1708 Fset_buffer_major_mode (buffer);
9732
577db538b0b6 (Fset_buffer_major_mode): New function. Set the default major mode here.
Karl Heuer <kwzh@gnu.org>
parents: 9632
diff changeset
1709 }
577db538b0b6 (Fset_buffer_major_mode): New function. Set the default major mode here.
Karl Heuer <kwzh@gnu.org>
parents: 9632
diff changeset
1710 }
98982
7ccc521ae6b1 (Fget_buffer, Fbury_buffer, switch_to_buffer_1):
Martin Rudalics <rudalics@gmx.at>
parents: 98732
diff changeset
1711 Fset_buffer (buffer);
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 392
diff changeset
1712 if (NILP (norecord))
98982
7ccc521ae6b1 (Fget_buffer, Fbury_buffer, switch_to_buffer_1):
Martin Rudalics <rudalics@gmx.at>
parents: 98732
diff changeset
1713 record_buffer (buffer);
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1714
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1715 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
1716 ? 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
1717 : selected_window,
98982
7ccc521ae6b1 (Fget_buffer, Fbury_buffer, switch_to_buffer_1):
Martin Rudalics <rudalics@gmx.at>
parents: 98732
diff changeset
1718 buffer, Qnil);
7ccc521ae6b1 (Fget_buffer, Fbury_buffer, switch_to_buffer_1):
Martin Rudalics <rudalics@gmx.at>
parents: 98732
diff changeset
1719
7ccc521ae6b1 (Fget_buffer, Fbury_buffer, switch_to_buffer_1):
Martin Rudalics <rudalics@gmx.at>
parents: 98732
diff changeset
1720 return buffer;
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1721 }
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1722
94249
982b68f17589 (Fswitch_to_buffer): Change interactive spec to call
Juri Linkov <juri@jurta.org>
parents: 93544
diff changeset
1723 DEFUN ("switch-to-buffer", Fswitch_to_buffer, Sswitch_to_buffer, 1, 2,
982b68f17589 (Fswitch_to_buffer): Change interactive spec to call
Juri Linkov <juri@jurta.org>
parents: 93544
diff changeset
1724 "(list (read-buffer-to-switch \"Switch to buffer: \"))",
99791
5ed566a3bada (Fswitch_to_buffer): Reword and mention new option
Martin Rudalics <rudalics@gmx.at>
parents: 99757
diff changeset
1725 doc: /* Make BUFFER-OR-NAME current and display it in selected window.
5ed566a3bada (Fswitch_to_buffer): Reword and mention new option
Martin Rudalics <rudalics@gmx.at>
parents: 99757
diff changeset
1726 BUFFER-OR-NAME may be a buffer, a string \(a buffer name), or
5ed566a3bada (Fswitch_to_buffer): Reword and mention new option
Martin Rudalics <rudalics@gmx.at>
parents: 99757
diff changeset
1727 nil. Return the buffer switched to.
5ed566a3bada (Fswitch_to_buffer): Reword and mention new option
Martin Rudalics <rudalics@gmx.at>
parents: 99757
diff changeset
1728
5ed566a3bada (Fswitch_to_buffer): Reword and mention new option
Martin Rudalics <rudalics@gmx.at>
parents: 99757
diff changeset
1729 If BUFFER-OR-NAME is a string and does not identify an existing
5ed566a3bada (Fswitch_to_buffer): Reword and mention new option
Martin Rudalics <rudalics@gmx.at>
parents: 99757
diff changeset
1730 buffer, create a new buffer with that name. Interactively, if
5ed566a3bada (Fswitch_to_buffer): Reword and mention new option
Martin Rudalics <rudalics@gmx.at>
parents: 99757
diff changeset
1731 `confirm-nonexistent-file-or-buffer' is non-nil, request
5ed566a3bada (Fswitch_to_buffer): Reword and mention new option
Martin Rudalics <rudalics@gmx.at>
parents: 99757
diff changeset
1732 confirmation before creating a new buffer. If BUFFER-OR-NAME is
5ed566a3bada (Fswitch_to_buffer): Reword and mention new option
Martin Rudalics <rudalics@gmx.at>
parents: 99757
diff changeset
1733 nil, switch to buffer returned by `other-buffer'.
5ed566a3bada (Fswitch_to_buffer): Reword and mention new option
Martin Rudalics <rudalics@gmx.at>
parents: 99757
diff changeset
1734
5ed566a3bada (Fswitch_to_buffer): Reword and mention new option
Martin Rudalics <rudalics@gmx.at>
parents: 99757
diff changeset
1735 Optional second arg NORECORD non-nil means do not put this buffer
5ed566a3bada (Fswitch_to_buffer): Reword and mention new option
Martin Rudalics <rudalics@gmx.at>
parents: 99757
diff changeset
1736 at the front of the list of recently selected ones. This
5ed566a3bada (Fswitch_to_buffer): Reword and mention new option
Martin Rudalics <rudalics@gmx.at>
parents: 99757
diff changeset
1737 function returns the buffer it switched to as a Lisp object.
5ed566a3bada (Fswitch_to_buffer): Reword and mention new option
Martin Rudalics <rudalics@gmx.at>
parents: 99757
diff changeset
1738
5ed566a3bada (Fswitch_to_buffer): Reword and mention new option
Martin Rudalics <rudalics@gmx.at>
parents: 99757
diff changeset
1739 If the selected window is the minibuffer window or dedicated to
5ed566a3bada (Fswitch_to_buffer): Reword and mention new option
Martin Rudalics <rudalics@gmx.at>
parents: 99757
diff changeset
1740 its buffer, use `pop-to-buffer' for displaying the buffer.
39971
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
1741
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
1742 WARNING: This is NOT the way to work on another buffer temporarily
99791
5ed566a3bada (Fswitch_to_buffer): Reword and mention new option
Martin Rudalics <rudalics@gmx.at>
parents: 99757
diff changeset
1743 within a Lisp program! Use `set-buffer' instead. That avoids
5ed566a3bada (Fswitch_to_buffer): Reword and mention new option
Martin Rudalics <rudalics@gmx.at>
parents: 99757
diff changeset
1744 messing with the window-buffer correspondences. */)
109179
8cfee7d2955f Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109165
diff changeset
1745 (Lisp_Object buffer_or_name, Lisp_Object 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
1746 {
98982
7ccc521ae6b1 (Fget_buffer, Fbury_buffer, switch_to_buffer_1):
Martin Rudalics <rudalics@gmx.at>
parents: 98732
diff changeset
1747 if (EQ (buffer_or_name, Fwindow_buffer (selected_window)))
72503
6ccb18aa8a5d (Fswitch_to_buffer): Move buffer to front of
Nick Roberts <nickrob@snap.net.nz>
parents: 72486
diff changeset
1748 {
72524
49a6e184d20a (Fswitch_to_buffer): Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents: 72503
diff changeset
1749 /* Basically a NOP. Avoid signalling an error in the case where
49a6e184d20a (Fswitch_to_buffer): Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents: 72503
diff changeset
1750 the selected window is dedicated, or a minibuffer. */
49a6e184d20a (Fswitch_to_buffer): Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents: 72503
diff changeset
1751
98982
7ccc521ae6b1 (Fget_buffer, Fbury_buffer, switch_to_buffer_1):
Martin Rudalics <rudalics@gmx.at>
parents: 98732
diff changeset
1752 /* But do put this buffer at the front of the buffer list, unless
7ccc521ae6b1 (Fget_buffer, Fbury_buffer, switch_to_buffer_1):
Martin Rudalics <rudalics@gmx.at>
parents: 98732
diff changeset
1753 that has been inhibited. Note that even if BUFFER-OR-NAME is
7ccc521ae6b1 (Fget_buffer, Fbury_buffer, switch_to_buffer_1):
Martin Rudalics <rudalics@gmx.at>
parents: 98732
diff changeset
1754 at the front of the main buffer-list already, we still want to
7ccc521ae6b1 (Fget_buffer, Fbury_buffer, switch_to_buffer_1):
Martin Rudalics <rudalics@gmx.at>
parents: 98732
diff changeset
1755 move it to the front of the frame's buffer list. */
72524
49a6e184d20a (Fswitch_to_buffer): Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents: 72503
diff changeset
1756 if (NILP (norecord))
98982
7ccc521ae6b1 (Fget_buffer, Fbury_buffer, switch_to_buffer_1):
Martin Rudalics <rudalics@gmx.at>
parents: 98732
diff changeset
1757 record_buffer (buffer_or_name);
7ccc521ae6b1 (Fget_buffer, Fbury_buffer, switch_to_buffer_1):
Martin Rudalics <rudalics@gmx.at>
parents: 98732
diff changeset
1758 return Fset_buffer (buffer_or_name);
72503
6ccb18aa8a5d (Fswitch_to_buffer): Move buffer to front of
Nick Roberts <nickrob@snap.net.nz>
parents: 72486
diff changeset
1759 }
102466
13c12974c2f0 (Fswitch_to_buffer): Revert part of 2008-10-21's change.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 100951
diff changeset
1760 else if (EQ (minibuf_window, selected_window)
13c12974c2f0 (Fswitch_to_buffer): Revert part of 2008-10-21's change.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 100951
diff changeset
1761 /* If `dedicated' is neither nil nor t, it means it's
13c12974c2f0 (Fswitch_to_buffer): Revert part of 2008-10-21's change.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 100951
diff changeset
1762 dedicatedness can be overridden by an explicit request
13c12974c2f0 (Fswitch_to_buffer): Revert part of 2008-10-21's change.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 100951
diff changeset
1763 such as a call to switch-to-buffer. */
13c12974c2f0 (Fswitch_to_buffer): Revert part of 2008-10-21's change.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 100951
diff changeset
1764 || EQ (Fwindow_dedicated_p (selected_window), Qt))
98982
7ccc521ae6b1 (Fget_buffer, Fbury_buffer, switch_to_buffer_1):
Martin Rudalics <rudalics@gmx.at>
parents: 98732
diff changeset
1765 /* We can't use the selected window so let `pop-to-buffer' try some
7ccc521ae6b1 (Fget_buffer, Fbury_buffer, switch_to_buffer_1):
Martin Rudalics <rudalics@gmx.at>
parents: 98732
diff changeset
1766 other window. */
7ccc521ae6b1 (Fget_buffer, Fbury_buffer, switch_to_buffer_1):
Martin Rudalics <rudalics@gmx.at>
parents: 98732
diff changeset
1767 return call3 (intern ("pop-to-buffer"), buffer_or_name, Qnil, norecord);
7ccc521ae6b1 (Fget_buffer, Fbury_buffer, switch_to_buffer_1):
Martin Rudalics <rudalics@gmx.at>
parents: 98732
diff changeset
1768 else
7ccc521ae6b1 (Fget_buffer, Fbury_buffer, switch_to_buffer_1):
Martin Rudalics <rudalics@gmx.at>
parents: 98732
diff changeset
1769 return switch_to_buffer_1 (buffer_or_name, norecord);
25181
847441efad8d (switch_to_buffer_1): New subroutine, taken out from Fswitch_to_buffer.
Richard M. Stallman <rms@gnu.org>
parents: 25021
diff changeset
1770 }
847441efad8d (switch_to_buffer_1): New subroutine, taken out from Fswitch_to_buffer.
Richard M. Stallman <rms@gnu.org>
parents: 25021
diff changeset
1771
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1772 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
1773 doc: /* Return the current buffer as a Lisp object. */)
109179
8cfee7d2955f Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109165
diff changeset
1774 (void)
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1775 {
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1776 register Lisp_Object buf;
9262
582534b6e763 (Fget_buffer_create, Frename_buffer, Fbuffer_disable_undo,
Karl Heuer <kwzh@gnu.org>
parents: 9211
diff changeset
1777 XSETBUFFER (buf, current_buffer);
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1778 return buf;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1779 }
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1780
25491
0359edc6e428 (set_buffer_internal): Never set
Gerd Moellmann <gerd@gnu.org>
parents: 25368
diff changeset
1781 /* Set the current buffer to B.
0359edc6e428 (set_buffer_internal): Never set
Gerd Moellmann <gerd@gnu.org>
parents: 25368
diff changeset
1782
0359edc6e428 (set_buffer_internal): Never set
Gerd Moellmann <gerd@gnu.org>
parents: 25368
diff changeset
1783 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
1784 global unchanged information in beg_unchanged and end_unchanged.
0359edc6e428 (set_buffer_internal): Never set
Gerd Moellmann <gerd@gnu.org>
parents: 25368
diff changeset
1785 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
1786 information on a buffer-basis. Every action affecting other
0359edc6e428 (set_buffer_internal): Never set
Gerd Moellmann <gerd@gnu.org>
parents: 25368
diff changeset
1787 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
1788 time, and that increments windows_or_buffers_changed. */
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1789
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1790 void
109144
7dceae91724c Convert most remaining function definitions to standard C.
Juanma Barranquero <lekktu@gmail.com>
parents: 109100
diff changeset
1791 set_buffer_internal (register struct buffer *b)
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1792 {
25368
f9949db6ca7d (set_buffer_internal): Set windows_or_buffers_changed
Gerd Moellmann <gerd@gnu.org>
parents: 25351
diff changeset
1793 if (current_buffer != b)
25491
0359edc6e428 (set_buffer_internal): Never set
Gerd Moellmann <gerd@gnu.org>
parents: 25368
diff changeset
1794 set_buffer_internal_1 (b);
11889
1067ddd12dfc (set_buffer_internal_1): New subroutine.
Karl Heuer <kwzh@gnu.org>
parents: 11838
diff changeset
1795 }
1067ddd12dfc (set_buffer_internal_1): New subroutine.
Karl Heuer <kwzh@gnu.org>
parents: 11838
diff changeset
1796
1067ddd12dfc (set_buffer_internal_1): New subroutine.
Karl Heuer <kwzh@gnu.org>
parents: 11838
diff changeset
1797 /* 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
1798 This is used by redisplay. */
1067ddd12dfc (set_buffer_internal_1): New subroutine.
Karl Heuer <kwzh@gnu.org>
parents: 11838
diff changeset
1799
1067ddd12dfc (set_buffer_internal_1): New subroutine.
Karl Heuer <kwzh@gnu.org>
parents: 11838
diff changeset
1800 void
109144
7dceae91724c Convert most remaining function definitions to standard C.
Juanma Barranquero <lekktu@gmail.com>
parents: 109100
diff changeset
1801 set_buffer_internal_1 (register struct buffer *b)
11889
1067ddd12dfc (set_buffer_internal_1): New subroutine.
Karl Heuer <kwzh@gnu.org>
parents: 11838
diff changeset
1802 {
1067ddd12dfc (set_buffer_internal_1): New subroutine.
Karl Heuer <kwzh@gnu.org>
parents: 11838
diff changeset
1803 register struct buffer *old_buf;
107984
bef5d1738c0b Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 107845
diff changeset
1804 register Lisp_Object tail;
11889
1067ddd12dfc (set_buffer_internal_1): New subroutine.
Karl Heuer <kwzh@gnu.org>
parents: 11838
diff changeset
1805
31604
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
1806 #ifdef USE_MMAP_FOR_BUFFERS
31416
9b8c5bea5e8d (set_buffer_internal_1) [REL_ALLOC_MMAP]: If
Gerd Moellmann <gerd@gnu.org>
parents: 31412
diff changeset
1807 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
1808 enlarge_buffer_text (b, 0);
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
1809 #endif /* USE_MMAP_FOR_BUFFERS */
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49444
diff changeset
1810
11889
1067ddd12dfc (set_buffer_internal_1): New subroutine.
Karl Heuer <kwzh@gnu.org>
parents: 11838
diff changeset
1811 if (current_buffer == b)
1067ddd12dfc (set_buffer_internal_1): New subroutine.
Karl Heuer <kwzh@gnu.org>
parents: 11838
diff changeset
1812 return;
1067ddd12dfc (set_buffer_internal_1): New subroutine.
Karl Heuer <kwzh@gnu.org>
parents: 11838
diff changeset
1813
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1814 old_buf = current_buffer;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1815 current_buffer = b;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1816 last_known_column_point = -1; /* invalidate indentation cache */
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1817
10314
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1818 if (old_buf)
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1819 {
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1820 /* 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
1821 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
1822 if (old_buf->base_buffer)
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1823 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
1824
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1825 /* 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
1826 when it is not current, update them now. */
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1827 if (! NILP (old_buf->pt_marker))
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1828 {
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1829 Lisp_Object obuf;
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1830 XSETBUFFER (obuf, old_buf);
20538
b964f3facafa (Fmake_indirect_buffer): Use set_marker_both.
Richard M. Stallman <rms@gnu.org>
parents: 20368
diff changeset
1831 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
1832 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
1833 }
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1834 if (! NILP (old_buf->begv_marker))
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1835 {
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1836 Lisp_Object obuf;
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1837 XSETBUFFER (obuf, old_buf);
20538
b964f3facafa (Fmake_indirect_buffer): Use set_marker_both.
Richard M. Stallman <rms@gnu.org>
parents: 20368
diff changeset
1838 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
1839 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
1840 }
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1841 if (! NILP (old_buf->zv_marker))
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1842 {
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1843 Lisp_Object obuf;
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1844 XSETBUFFER (obuf, old_buf);
20538
b964f3facafa (Fmake_indirect_buffer): Use set_marker_both.
Richard M. Stallman <rms@gnu.org>
parents: 20368
diff changeset
1845 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
1846 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
1847 }
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1848 }
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1849
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1850 /* 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
1851 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
1852 if (b->base_buffer)
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1853 b->undo_list = b->base_buffer->undo_list;
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1854
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1855 /* 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
1856 when it is not current, fetch them now. */
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1857 if (! NILP (b->pt_marker))
20538
b964f3facafa (Fmake_indirect_buffer): Use set_marker_both.
Richard M. Stallman <rms@gnu.org>
parents: 20368
diff changeset
1858 {
b964f3facafa (Fmake_indirect_buffer): Use set_marker_both.
Richard M. Stallman <rms@gnu.org>
parents: 20368
diff changeset
1859 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
1860 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
1861 }
10314
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1862 if (! NILP (b->begv_marker))
20538
b964f3facafa (Fmake_indirect_buffer): Use set_marker_both.
Richard M. Stallman <rms@gnu.org>
parents: 20368
diff changeset
1863 {
b964f3facafa (Fmake_indirect_buffer): Use set_marker_both.
Richard M. Stallman <rms@gnu.org>
parents: 20368
diff changeset
1864 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
1865 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
1866 }
10314
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1867 if (! NILP (b->zv_marker))
20538
b964f3facafa (Fmake_indirect_buffer): Use set_marker_both.
Richard M. Stallman <rms@gnu.org>
parents: 20368
diff changeset
1868 {
b964f3facafa (Fmake_indirect_buffer): Use set_marker_both.
Richard M. Stallman <rms@gnu.org>
parents: 20368
diff changeset
1869 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
1870 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
1871 }
10314
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1872
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1873 /* Look down buffer's list of local Lisp variables
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1874 to find and update any that forward into C variables. */
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1875
107984
bef5d1738c0b Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 107845
diff changeset
1876 do
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1877 {
107984
bef5d1738c0b Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 107845
diff changeset
1878 for (tail = b->local_var_alist; CONSP (tail); tail = XCDR (tail))
bef5d1738c0b Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 107845
diff changeset
1879 {
bef5d1738c0b Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 107845
diff changeset
1880 Lisp_Object var = XCAR (XCAR (tail));
bef5d1738c0b Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 107845
diff changeset
1881 struct Lisp_Symbol *sym = XSYMBOL (var);
bef5d1738c0b Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 107845
diff changeset
1882 if (sym->redirect == SYMBOL_LOCALIZED /* Just to be sure. */
bef5d1738c0b Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 107845
diff changeset
1883 && SYMBOL_BLV (sym)->fwd)
bef5d1738c0b Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 107845
diff changeset
1884 /* Just reference the variable
bef5d1738c0b Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 107845
diff changeset
1885 to cause it to become set for this buffer. */
bef5d1738c0b Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 107845
diff changeset
1886 Fsymbol_value (var);
bef5d1738c0b Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 107845
diff changeset
1887 }
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1888 }
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1889 /* Do the same with any others that were local to the previous buffer */
107984
bef5d1738c0b Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 107845
diff changeset
1890 while (b != old_buf && (b = old_buf, b));
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1891 }
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1892
10314
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1893 /* 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
1894 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
1895
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1896 void
109144
7dceae91724c Convert most remaining function definitions to standard C.
Juanma Barranquero <lekktu@gmail.com>
parents: 109100
diff changeset
1897 set_buffer_temp (struct buffer *b)
10314
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1898 {
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1899 register struct buffer *old_buf;
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1900
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1901 if (current_buffer == b)
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1902 return;
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1903
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1904 old_buf = current_buffer;
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1905 current_buffer = b;
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 if (old_buf)
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 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
1910 when it is not current, update them now. */
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1911 if (! NILP (old_buf->pt_marker))
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1912 {
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1913 Lisp_Object obuf;
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1914 XSETBUFFER (obuf, old_buf);
20538
b964f3facafa (Fmake_indirect_buffer): Use set_marker_both.
Richard M. Stallman <rms@gnu.org>
parents: 20368
diff changeset
1915 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
1916 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
1917 }
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1918 if (! NILP (old_buf->begv_marker))
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1919 {
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1920 Lisp_Object obuf;
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1921 XSETBUFFER (obuf, old_buf);
20538
b964f3facafa (Fmake_indirect_buffer): Use set_marker_both.
Richard M. Stallman <rms@gnu.org>
parents: 20368
diff changeset
1922 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
1923 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
1924 }
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1925 if (! NILP (old_buf->zv_marker))
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 Lisp_Object obuf;
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1928 XSETBUFFER (obuf, old_buf);
20538
b964f3facafa (Fmake_indirect_buffer): Use set_marker_both.
Richard M. Stallman <rms@gnu.org>
parents: 20368
diff changeset
1929 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
1930 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
1931 }
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1932 }
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1933
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1934 /* 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
1935 when it is not current, fetch them now. */
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1936 if (! NILP (b->pt_marker))
20538
b964f3facafa (Fmake_indirect_buffer): Use set_marker_both.
Richard M. Stallman <rms@gnu.org>
parents: 20368
diff changeset
1937 {
b964f3facafa (Fmake_indirect_buffer): Use set_marker_both.
Richard M. Stallman <rms@gnu.org>
parents: 20368
diff changeset
1938 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
1939 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
1940 }
10314
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1941 if (! NILP (b->begv_marker))
20538
b964f3facafa (Fmake_indirect_buffer): Use set_marker_both.
Richard M. Stallman <rms@gnu.org>
parents: 20368
diff changeset
1942 {
b964f3facafa (Fmake_indirect_buffer): Use set_marker_both.
Richard M. Stallman <rms@gnu.org>
parents: 20368
diff changeset
1943 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
1944 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
1945 }
10314
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1946 if (! NILP (b->zv_marker))
20538
b964f3facafa (Fmake_indirect_buffer): Use set_marker_both.
Richard M. Stallman <rms@gnu.org>
parents: 20368
diff changeset
1947 {
b964f3facafa (Fmake_indirect_buffer): Use set_marker_both.
Richard M. Stallman <rms@gnu.org>
parents: 20368
diff changeset
1948 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
1949 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
1950 }
10314
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1951 }
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
1952
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1953 DEFUN ("set-buffer", Fset_buffer, Sset_buffer, 1, 1, 0,
98982
7ccc521ae6b1 (Fget_buffer, Fbury_buffer, switch_to_buffer_1):
Martin Rudalics <rudalics@gmx.at>
parents: 98732
diff changeset
1954 doc: /* Make buffer BUFFER-OR-NAME current for editing operations.
7ccc521ae6b1 (Fget_buffer, Fbury_buffer, switch_to_buffer_1):
Martin Rudalics <rudalics@gmx.at>
parents: 98732
diff changeset
1955 BUFFER-OR-NAME may be a buffer or the name of an existing buffer. See
7ccc521ae6b1 (Fget_buffer, Fbury_buffer, switch_to_buffer_1):
Martin Rudalics <rudalics@gmx.at>
parents: 98732
diff changeset
1956 also `save-excursion' when you want to make a buffer current
7ccc521ae6b1 (Fget_buffer, Fbury_buffer, switch_to_buffer_1):
Martin Rudalics <rudalics@gmx.at>
parents: 98732
diff changeset
1957 temporarily. This function does not display the buffer, so its effect
7ccc521ae6b1 (Fget_buffer, Fbury_buffer, switch_to_buffer_1):
Martin Rudalics <rudalics@gmx.at>
parents: 98732
diff changeset
1958 ends when the current command terminates. Use `switch-to-buffer' or
7ccc521ae6b1 (Fget_buffer, Fbury_buffer, switch_to_buffer_1):
Martin Rudalics <rudalics@gmx.at>
parents: 98732
diff changeset
1959 `pop-to-buffer' to switch buffers permanently. */)
109179
8cfee7d2955f Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109165
diff changeset
1960 (register Lisp_Object buffer_or_name)
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1961 {
98982
7ccc521ae6b1 (Fget_buffer, Fbury_buffer, switch_to_buffer_1):
Martin Rudalics <rudalics@gmx.at>
parents: 98732
diff changeset
1962 register Lisp_Object buffer;
7ccc521ae6b1 (Fget_buffer, Fbury_buffer, switch_to_buffer_1):
Martin Rudalics <rudalics@gmx.at>
parents: 98732
diff changeset
1963 buffer = Fget_buffer (buffer_or_name);
7ccc521ae6b1 (Fget_buffer, Fbury_buffer, switch_to_buffer_1):
Martin Rudalics <rudalics@gmx.at>
parents: 98732
diff changeset
1964 if (NILP (buffer))
7ccc521ae6b1 (Fget_buffer, Fbury_buffer, switch_to_buffer_1):
Martin Rudalics <rudalics@gmx.at>
parents: 98732
diff changeset
1965 nsberror (buffer_or_name);
7ccc521ae6b1 (Fget_buffer, Fbury_buffer, switch_to_buffer_1):
Martin Rudalics <rudalics@gmx.at>
parents: 98732
diff changeset
1966 if (NILP (XBUFFER (buffer)->name))
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1967 error ("Selecting deleted buffer");
98982
7ccc521ae6b1 (Fget_buffer, Fbury_buffer, switch_to_buffer_1):
Martin Rudalics <rudalics@gmx.at>
parents: 98732
diff changeset
1968 set_buffer_internal (XBUFFER (buffer));
7ccc521ae6b1 (Fget_buffer, Fbury_buffer, switch_to_buffer_1):
Martin Rudalics <rudalics@gmx.at>
parents: 98732
diff changeset
1969 return buffer;
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1970 }
20698
ec08780e4c42 (set_buffer_if_live): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20679
diff changeset
1971
ec08780e4c42 (set_buffer_if_live): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20679
diff changeset
1972 /* 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
1973
ec08780e4c42 (set_buffer_if_live): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20679
diff changeset
1974 Lisp_Object
109144
7dceae91724c Convert most remaining function definitions to standard C.
Juanma Barranquero <lekktu@gmail.com>
parents: 109100
diff changeset
1975 set_buffer_if_live (Lisp_Object buffer)
20698
ec08780e4c42 (set_buffer_if_live): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20679
diff changeset
1976 {
ec08780e4c42 (set_buffer_if_live): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20679
diff changeset
1977 if (! NILP (XBUFFER (buffer)->name))
ec08780e4c42 (set_buffer_if_live): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20679
diff changeset
1978 Fset_buffer (buffer);
ec08780e4c42 (set_buffer_if_live): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20679
diff changeset
1979 return Qnil;
ec08780e4c42 (set_buffer_if_live): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20679
diff changeset
1980 }
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1981
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1982 DEFUN ("barf-if-buffer-read-only", Fbarf_if_buffer_read_only,
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1983 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
1984 doc: /* Signal a `buffer-read-only' error if the current buffer is read-only. */)
109179
8cfee7d2955f Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109165
diff changeset
1985 (void)
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1986 {
3481
56424e6245c2 (syms_of_buffer): Set up Lisp var inhibit-read-only.
Richard M. Stallman <rms@gnu.org>
parents: 3463
diff changeset
1987 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
1988 && NILP (Vinhibit_read_only))
71968
b0505e901bff (Fbuffer_local_value, Fbarf_if_buffer_read_only):
Kim F. Storm <storm@cua.dk>
parents: 70931
diff changeset
1989 xsignal1 (Qbuffer_read_only, Fcurrent_buffer ());
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1990 return Qnil;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1991 }
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1992
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
1993 DEFUN ("bury-buffer", Fbury_buffer, Sbury_buffer, 0, 1, "",
98982
7ccc521ae6b1 (Fget_buffer, Fbury_buffer, switch_to_buffer_1):
Martin Rudalics <rudalics@gmx.at>
parents: 98732
diff changeset
1994 doc: /* Put BUFFER-OR-NAME at the end of the list of all buffers.
39971
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
1995 There it is the least likely candidate for `other-buffer' to return;
98982
7ccc521ae6b1 (Fget_buffer, Fbury_buffer, switch_to_buffer_1):
Martin Rudalics <rudalics@gmx.at>
parents: 98732
diff changeset
1996 thus, the least likely buffer for \\[switch-to-buffer] to select by
7ccc521ae6b1 (Fget_buffer, Fbury_buffer, switch_to_buffer_1):
Martin Rudalics <rudalics@gmx.at>
parents: 98732
diff changeset
1997 default.
7ccc521ae6b1 (Fget_buffer, Fbury_buffer, switch_to_buffer_1):
Martin Rudalics <rudalics@gmx.at>
parents: 98732
diff changeset
1998
7ccc521ae6b1 (Fget_buffer, Fbury_buffer, switch_to_buffer_1):
Martin Rudalics <rudalics@gmx.at>
parents: 98732
diff changeset
1999 The argument may be a buffer name or an actual buffer object. If
7ccc521ae6b1 (Fget_buffer, Fbury_buffer, switch_to_buffer_1):
Martin Rudalics <rudalics@gmx.at>
parents: 98732
diff changeset
2000 BUFFER-OR-NAME is nil or omitted, bury the current buffer and remove it
99080
ccaba4c89996 (Fget_buffer_create): Rename arg to buffer_or_name. Reword doc-string.
Martin Rudalics <rudalics@gmx.at>
parents: 98982
diff changeset
2001 from the selected window if it is displayed there. If the selected
ccaba4c89996 (Fget_buffer_create): Rename arg to buffer_or_name. Reword doc-string.
Martin Rudalics <rudalics@gmx.at>
parents: 98982
diff changeset
2002 window is dedicated to its buffer, delete that window if there are other
ccaba4c89996 (Fget_buffer_create): Rename arg to buffer_or_name. Reword doc-string.
Martin Rudalics <rudalics@gmx.at>
parents: 98982
diff changeset
2003 windows on the same frame. If the selected window is the only window on
ccaba4c89996 (Fget_buffer_create): Rename arg to buffer_or_name. Reword doc-string.
Martin Rudalics <rudalics@gmx.at>
parents: 98982
diff changeset
2004 its frame, iconify that frame. */)
109179
8cfee7d2955f Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109165
diff changeset
2005 (register Lisp_Object buffer_or_name)
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
2006 {
98982
7ccc521ae6b1 (Fget_buffer, Fbury_buffer, switch_to_buffer_1):
Martin Rudalics <rudalics@gmx.at>
parents: 98732
diff changeset
2007 Lisp_Object buffer;
7ccc521ae6b1 (Fget_buffer, Fbury_buffer, switch_to_buffer_1):
Martin Rudalics <rudalics@gmx.at>
parents: 98732
diff changeset
2008
1252
86a17674c2a1 * buffer.c (Fbury_buffer): This used to undisplay the buffer being
Jim Blandy <jimb@redhat.com>
parents: 1195
diff changeset
2009 /* Figure out what buffer we're going to bury. */
98982
7ccc521ae6b1 (Fget_buffer, Fbury_buffer, switch_to_buffer_1):
Martin Rudalics <rudalics@gmx.at>
parents: 98732
diff changeset
2010 if (NILP (buffer_or_name))
1586
f84e400808d0 * buffer.c (Ferase_buffer): Doc fix.
Jim Blandy <jimb@redhat.com>
parents: 1563
diff changeset
2011 {
39802
efbac46c874c (Fbury_buffer): Don't try to remove the buffer from the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39748
diff changeset
2012 Lisp_Object tem;
14060
b62397f49a24 (Fmake_indirect_buffer, Fset_buffer_major_mode, Fpop_to_buffer,
Erik Naggum <erik@naggum.no>
parents: 13922
diff changeset
2013 XSETBUFFER (buffer, current_buffer);
18485
d6e8b92585e9 (Fbury_buffer): Undo previous change.
Richard M. Stallman <rms@gnu.org>
parents: 18455
diff changeset
2014
39802
efbac46c874c (Fbury_buffer): Don't try to remove the buffer from the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39748
diff changeset
2015 tem = Fwindow_buffer (selected_window);
18485
d6e8b92585e9 (Fbury_buffer): Undo previous change.
Richard M. Stallman <rms@gnu.org>
parents: 18455
diff changeset
2016 /* 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
2017 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
2018 {
2b65fb0dbd2d (Fbury_buffer): Use braces to follow GNU Coding Standards.
Pavel Janík <Pavel@Janik.cz>
parents: 40760
diff changeset
2019 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
2020 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
2021 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
2022 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
2023 else
2b65fb0dbd2d (Fbury_buffer): Use braces to follow GNU Coding Standards.
Pavel Janík <Pavel@Janik.cz>
parents: 40760
diff changeset
2024 Fdelete_window (selected_window);
2b65fb0dbd2d (Fbury_buffer): Use braces to follow GNU Coding Standards.
Pavel Janík <Pavel@Janik.cz>
parents: 40760
diff changeset
2025 }
1586
f84e400808d0 * buffer.c (Ferase_buffer): Doc fix.
Jim Blandy <jimb@redhat.com>
parents: 1563
diff changeset
2026 }
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
2027 else
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
2028 {
98982
7ccc521ae6b1 (Fget_buffer, Fbury_buffer, switch_to_buffer_1):
Martin Rudalics <rudalics@gmx.at>
parents: 98732
diff changeset
2029 buffer = Fget_buffer (buffer_or_name);
7ccc521ae6b1 (Fget_buffer, Fbury_buffer, switch_to_buffer_1):
Martin Rudalics <rudalics@gmx.at>
parents: 98732
diff changeset
2030 if (NILP (buffer))
7ccc521ae6b1 (Fget_buffer, Fbury_buffer, switch_to_buffer_1):
Martin Rudalics <rudalics@gmx.at>
parents: 98732
diff changeset
2031 nsberror (buffer_or_name);
1252
86a17674c2a1 * buffer.c (Fbury_buffer): This used to undisplay the buffer being
Jim Blandy <jimb@redhat.com>
parents: 1195
diff changeset
2032 }
86a17674c2a1 * buffer.c (Fbury_buffer): This used to undisplay the buffer being
Jim Blandy <jimb@redhat.com>
parents: 1195
diff changeset
2033
28991
f8bcf3bec2a6 (Fbury_buffer): Avoid trouble from burying a killed buffer.
Gerd Moellmann <gerd@gnu.org>
parents: 28878
diff changeset
2034 /* 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
2035 buffer is killed. */
f8bcf3bec2a6 (Fbury_buffer): Avoid trouble from burying a killed buffer.
Gerd Moellmann <gerd@gnu.org>
parents: 28878
diff changeset
2036 if (!NILP (XBUFFER (buffer)->name))
f8bcf3bec2a6 (Fbury_buffer): Avoid trouble from burying a killed buffer.
Gerd Moellmann <gerd@gnu.org>
parents: 28878
diff changeset
2037 {
f8bcf3bec2a6 (Fbury_buffer): Avoid trouble from burying a killed buffer.
Gerd Moellmann <gerd@gnu.org>
parents: 28878
diff changeset
2038 Lisp_Object aelt, link;
f8bcf3bec2a6 (Fbury_buffer): Avoid trouble from burying a killed buffer.
Gerd Moellmann <gerd@gnu.org>
parents: 28878
diff changeset
2039
f8bcf3bec2a6 (Fbury_buffer): Avoid trouble from burying a killed buffer.
Gerd Moellmann <gerd@gnu.org>
parents: 28878
diff changeset
2040 aelt = Frassq (buffer, Vbuffer_alist);
f8bcf3bec2a6 (Fbury_buffer): Avoid trouble from burying a killed buffer.
Gerd Moellmann <gerd@gnu.org>
parents: 28878
diff changeset
2041 link = Fmemq (aelt, Vbuffer_alist);
f8bcf3bec2a6 (Fbury_buffer): Avoid trouble from burying a killed buffer.
Gerd Moellmann <gerd@gnu.org>
parents: 28878
diff changeset
2042 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
2043 XSETCDR (link, Qnil);
28991
f8bcf3bec2a6 (Fbury_buffer): Avoid trouble from burying a killed buffer.
Gerd Moellmann <gerd@gnu.org>
parents: 28878
diff changeset
2044 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
2045
83415
d2c799f58129 Implement full support for frame-local `next-buffer' and `previous-buffer'.
Karoly Lorentey <lorentey@elte.hu>
parents: 83407
diff changeset
2046 XFRAME (selected_frame)->buffer_list
d2c799f58129 Implement full support for frame-local `next-buffer' and `previous-buffer'.
Karoly Lorentey <lorentey@elte.hu>
parents: 83407
diff changeset
2047 = Fdelq (buffer, XFRAME (selected_frame)->buffer_list);
d2c799f58129 Implement full support for frame-local `next-buffer' and `previous-buffer'.
Karoly Lorentey <lorentey@elte.hu>
parents: 83407
diff changeset
2048 XFRAME (selected_frame)->buried_buffer_list
d2c799f58129 Implement full support for frame-local `next-buffer' and `previous-buffer'.
Karoly Lorentey <lorentey@elte.hu>
parents: 83407
diff changeset
2049 = Fcons (buffer, Fdelq (buffer, XFRAME (selected_frame)->buried_buffer_list));
28991
f8bcf3bec2a6 (Fbury_buffer): Avoid trouble from burying a killed buffer.
Gerd Moellmann <gerd@gnu.org>
parents: 28878
diff changeset
2050 }
17234
bda734eef575 (Fbury_buffer): Call frames_bury_buffer.
Richard M. Stallman <rms@gnu.org>
parents: 17220
diff changeset
2051
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
2052 return Qnil;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
2053 }
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
2054
1953
714df59790af (Ferase_buffer): Added interactive spec.
Roland McGrath <roland@gnu.org>
parents: 1952
diff changeset
2055 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
2056 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
2057 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
2058 so the buffer is truly empty after this. */)
109179
8cfee7d2955f Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109165
diff changeset
2059 (void)
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
2060 {
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
2061 Fwiden ();
26056
9c4556ef15de (Fget_buffer_create, Fmake_indirect_buffer, Fkill_buffer):
Gerd Moellmann <gerd@gnu.org>
parents: 25744
diff changeset
2062
9c4556ef15de (Fget_buffer_create, Fmake_indirect_buffer, Fkill_buffer):
Gerd Moellmann <gerd@gnu.org>
parents: 25744
diff changeset
2063 del_range (BEG, Z);
25626
acfb741e6e24 (Ferase_buffer): Don't erase the minibuffer prompt.
Richard M. Stallman <rms@gnu.org>
parents: 25546
diff changeset
2064
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
2065 current_buffer->last_window_start = 1;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
2066 /* Prevent warnings, or suspension of auto saving, that would happen
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
2067 if future size is less than past size. Use of erase-buffer
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
2068 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
2069 XSETFASTINT (current_buffer->save_length, 0);
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
2070 return Qnil;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
2071 }
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
2072
20368
9f5fab56f4b3 (nsberror, record_buffer, validate_region,
Kenichi Handa <handa@m17n.org>
parents: 20186
diff changeset
2073 void
109144
7dceae91724c Convert most remaining function definitions to standard C.
Juanma Barranquero <lekktu@gmail.com>
parents: 109100
diff changeset
2074 validate_region (register Lisp_Object *b, register Lisp_Object *e)
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
2075 {
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40605
diff changeset
2076 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
2077 CHECK_NUMBER_COERCE_MARKER (*e);
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
2078
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
2079 if (XINT (*b) > XINT (*e))
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
2080 {
9335
8cf58b38d244 (validate_region): Swap using temp Lisp_Object, not int.
Karl Heuer <kwzh@gnu.org>
parents: 9296
diff changeset
2081 Lisp_Object tem;
8cf58b38d244 (validate_region): Swap using temp Lisp_Object, not int.
Karl Heuer <kwzh@gnu.org>
parents: 9296
diff changeset
2082 tem = *b; *b = *e; *e = tem;
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
2083 }
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
2084
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
2085 if (!(BEGV <= XINT (*b) && XINT (*b) <= XINT (*e)
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
2086 && XINT (*e) <= ZV))
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
2087 args_out_of_range (*b, *e);
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
2088 }
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
2089
20868
83f23c9f7c4d (advance_to_char_boundary): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20853
diff changeset
2090 /* 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
2091 and return the adjusted position. */
83f23c9f7c4d (advance_to_char_boundary): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20853
diff changeset
2092
83f23c9f7c4d (advance_to_char_boundary): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20853
diff changeset
2093 static int
110545
6ae8bab9b79a Fix int/EMACS_INT use in buffer.c.
Eli Zaretskii <eliz@gnu.org>
parents: 110361
diff changeset
2094 advance_to_char_boundary (EMACS_INT byte_pos)
20868
83f23c9f7c4d (advance_to_char_boundary): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20853
diff changeset
2095 {
21085
6b0336de5fbe (advance_to_char_boundary): Handle the case the code
Richard M. Stallman <rms@gnu.org>
parents: 21065
diff changeset
2096 int c;
6b0336de5fbe (advance_to_char_boundary): Handle the case the code
Richard M. Stallman <rms@gnu.org>
parents: 21065
diff changeset
2097
6b0336de5fbe (advance_to_char_boundary): Handle the case the code
Richard M. Stallman <rms@gnu.org>
parents: 21065
diff changeset
2098 if (byte_pos == BEG)
6b0336de5fbe (advance_to_char_boundary): Handle the case the code
Richard M. Stallman <rms@gnu.org>
parents: 21065
diff changeset
2099 /* 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
2100 return BEG;
21085
6b0336de5fbe (advance_to_char_boundary): Handle the case the code
Richard M. Stallman <rms@gnu.org>
parents: 21065
diff changeset
2101
6b0336de5fbe (advance_to_char_boundary): Handle the case the code
Richard M. Stallman <rms@gnu.org>
parents: 21065
diff changeset
2102 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
2103 if (! CHAR_HEAD_P (c))
20868
83f23c9f7c4d (advance_to_char_boundary): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20853
diff changeset
2104 {
25508
b65b5bdae65a Type in comment fixed.
Kenichi Handa <handa@m17n.org>
parents: 25491
diff changeset
2105 /* 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
2106 multibyte sequence. */
110545
6ae8bab9b79a Fix int/EMACS_INT use in buffer.c.
Eli Zaretskii <eliz@gnu.org>
parents: 110361
diff changeset
2107 EMACS_INT orig_byte_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
2108
d8c9e2f7022f (advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents: 28991
diff changeset
2109 do
d8c9e2f7022f (advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents: 28991
diff changeset
2110 {
d8c9e2f7022f (advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents: 28991
diff changeset
2111 byte_pos--;
d8c9e2f7022f (advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents: 28991
diff changeset
2112 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
2113 }
d8c9e2f7022f (advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents: 28991
diff changeset
2114 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
2115 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
2116 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
2117 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
2118 /* 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
2119 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
2120 not, BYTE_POS was unchanged. */
20868
83f23c9f7c4d (advance_to_char_boundary): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20853
diff changeset
2121 }
83f23c9f7c4d (advance_to_char_boundary): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20853
diff changeset
2122
20935
2fc5eb0799fe (advance_to_char_boundary): Make the behaviour
Kenichi Handa <handa@m17n.org>
parents: 20868
diff changeset
2123 return byte_pos;
20868
83f23c9f7c4d (advance_to_char_boundary): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20853
diff changeset
2124 }
83f23c9f7c4d (advance_to_char_boundary): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20853
diff changeset
2125
100673
01f68a925d12 * ralloc.c (r_alloc_reset_variable): New function.
Jason Rumney <jasonr@gnu.org>
parents: 100633
diff changeset
2126 #ifdef REL_ALLOC
109100
2bc9a0c04c87 Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents: 108890
diff changeset
2127 extern void r_alloc_reset_variable (POINTER_TYPE *, POINTER_TYPE *);
100673
01f68a925d12 * ralloc.c (r_alloc_reset_variable): New function.
Jason Rumney <jasonr@gnu.org>
parents: 100633
diff changeset
2128 #endif /* REL_ALLOC */
01f68a925d12 * ralloc.c (r_alloc_reset_variable): New function.
Jason Rumney <jasonr@gnu.org>
parents: 100633
diff changeset
2129
92215
4a11735d1bdb (Fbuffer_swap_text): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 91781
diff changeset
2130 DEFUN ("buffer-swap-text", Fbuffer_swap_text, Sbuffer_swap_text,
4a11735d1bdb (Fbuffer_swap_text): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 91781
diff changeset
2131 1, 1, 0,
4a11735d1bdb (Fbuffer_swap_text): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 91781
diff changeset
2132 doc: /* Swap the text between current buffer and BUFFER. */)
109179
8cfee7d2955f Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109165
diff changeset
2133 (Lisp_Object buffer)
92215
4a11735d1bdb (Fbuffer_swap_text): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 91781
diff changeset
2134 {
4a11735d1bdb (Fbuffer_swap_text): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 91781
diff changeset
2135 struct buffer *other_buffer;
4a11735d1bdb (Fbuffer_swap_text): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 91781
diff changeset
2136 CHECK_BUFFER (buffer);
4a11735d1bdb (Fbuffer_swap_text): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 91781
diff changeset
2137 other_buffer = XBUFFER (buffer);
4a11735d1bdb (Fbuffer_swap_text): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 91781
diff changeset
2138
100295
2ddd196a711d (Fbuffer_swap_text): Signal error if swapping a dead buffer.
Chong Yidong <cyd@stupidchicken.com>
parents: 99791
diff changeset
2139 if (NILP (other_buffer->name))
108890
d9257436d2b1 Remove obsolete macro BASE_LEADING_CODE_P.
Juanma Barranquero <lekktu@gmail.com>
parents: 108880
diff changeset
2140 error ("Cannot swap a dead buffer's text");
100295
2ddd196a711d (Fbuffer_swap_text): Signal error if swapping a dead buffer.
Chong Yidong <cyd@stupidchicken.com>
parents: 99791
diff changeset
2141
92215
4a11735d1bdb (Fbuffer_swap_text): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 91781
diff changeset
2142 /* Actually, it probably works just fine.
4a11735d1bdb (Fbuffer_swap_text): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 91781
diff changeset
2143 * if (other_buffer == current_buffer)
4a11735d1bdb (Fbuffer_swap_text): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 91781
diff changeset
2144 * error ("Cannot swap a buffer's text with itself"); */
4a11735d1bdb (Fbuffer_swap_text): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 91781
diff changeset
2145
4a11735d1bdb (Fbuffer_swap_text): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 91781
diff changeset
2146 /* Actually, this may be workable as well, tho probably only if they're
4a11735d1bdb (Fbuffer_swap_text): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 91781
diff changeset
2147 *both* indirect. */
4a11735d1bdb (Fbuffer_swap_text): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 91781
diff changeset
2148 if (other_buffer->base_buffer
4a11735d1bdb (Fbuffer_swap_text): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 91781
diff changeset
2149 || current_buffer->base_buffer)
4a11735d1bdb (Fbuffer_swap_text): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 91781
diff changeset
2150 error ("Cannot swap indirect buffers's text");
4a11735d1bdb (Fbuffer_swap_text): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 91781
diff changeset
2151
4a11735d1bdb (Fbuffer_swap_text): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 91781
diff changeset
2152 { /* This is probably harder to make work. */
4a11735d1bdb (Fbuffer_swap_text): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 91781
diff changeset
2153 struct buffer *other;
4a11735d1bdb (Fbuffer_swap_text): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 91781
diff changeset
2154 for (other = all_buffers; other; other = other->next)
4a11735d1bdb (Fbuffer_swap_text): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 91781
diff changeset
2155 if (other->base_buffer == other_buffer
4a11735d1bdb (Fbuffer_swap_text): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 91781
diff changeset
2156 || other->base_buffer == current_buffer)
4a11735d1bdb (Fbuffer_swap_text): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 91781
diff changeset
2157 error ("One of the buffers to swap has indirect buffers");
4a11735d1bdb (Fbuffer_swap_text): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 91781
diff changeset
2158 }
4a11735d1bdb (Fbuffer_swap_text): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 91781
diff changeset
2159
4a11735d1bdb (Fbuffer_swap_text): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 91781
diff changeset
2160 #define swapfield(field, type) \
4a11735d1bdb (Fbuffer_swap_text): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 91781
diff changeset
2161 do { \
4a11735d1bdb (Fbuffer_swap_text): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 91781
diff changeset
2162 type tmp##field = other_buffer->field; \
4a11735d1bdb (Fbuffer_swap_text): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 91781
diff changeset
2163 other_buffer->field = current_buffer->field; \
4a11735d1bdb (Fbuffer_swap_text): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 91781
diff changeset
2164 current_buffer->field = tmp##field; \
4a11735d1bdb (Fbuffer_swap_text): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 91781
diff changeset
2165 } while (0)
4a11735d1bdb (Fbuffer_swap_text): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 91781
diff changeset
2166
4a11735d1bdb (Fbuffer_swap_text): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 91781
diff changeset
2167 swapfield (own_text, struct buffer_text);
4a11735d1bdb (Fbuffer_swap_text): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 91781
diff changeset
2168 eassert (current_buffer->text == &current_buffer->own_text);
4a11735d1bdb (Fbuffer_swap_text): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 91781
diff changeset
2169 eassert (other_buffer->text == &other_buffer->own_text);
100673
01f68a925d12 * ralloc.c (r_alloc_reset_variable): New function.
Jason Rumney <jasonr@gnu.org>
parents: 100633
diff changeset
2170 #ifdef REL_ALLOC
100682
5616d3b5b959 (Fbuffer_swap_text): Use POINTER_TYPE.
Jason Rumney <jasonr@gnu.org>
parents: 100673
diff changeset
2171 r_alloc_reset_variable ((POINTER_TYPE **) &current_buffer->own_text.beg,
5616d3b5b959 (Fbuffer_swap_text): Use POINTER_TYPE.
Jason Rumney <jasonr@gnu.org>
parents: 100673
diff changeset
2172 (POINTER_TYPE **) &other_buffer->own_text.beg);
5616d3b5b959 (Fbuffer_swap_text): Use POINTER_TYPE.
Jason Rumney <jasonr@gnu.org>
parents: 100673
diff changeset
2173 r_alloc_reset_variable ((POINTER_TYPE **) &other_buffer->own_text.beg,
5616d3b5b959 (Fbuffer_swap_text): Use POINTER_TYPE.
Jason Rumney <jasonr@gnu.org>
parents: 100673
diff changeset
2174 (POINTER_TYPE **) &current_buffer->own_text.beg);
100673
01f68a925d12 * ralloc.c (r_alloc_reset_variable): New function.
Jason Rumney <jasonr@gnu.org>
parents: 100633
diff changeset
2175 #endif /* REL_ALLOC */
01f68a925d12 * ralloc.c (r_alloc_reset_variable): New function.
Jason Rumney <jasonr@gnu.org>
parents: 100633
diff changeset
2176
92215
4a11735d1bdb (Fbuffer_swap_text): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 91781
diff changeset
2177 swapfield (pt, EMACS_INT);
4a11735d1bdb (Fbuffer_swap_text): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 91781
diff changeset
2178 swapfield (pt_byte, EMACS_INT);
4a11735d1bdb (Fbuffer_swap_text): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 91781
diff changeset
2179 swapfield (begv, EMACS_INT);
4a11735d1bdb (Fbuffer_swap_text): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 91781
diff changeset
2180 swapfield (begv_byte, EMACS_INT);
4a11735d1bdb (Fbuffer_swap_text): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 91781
diff changeset
2181 swapfield (zv, EMACS_INT);
4a11735d1bdb (Fbuffer_swap_text): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 91781
diff changeset
2182 swapfield (zv_byte, EMACS_INT);
4a11735d1bdb (Fbuffer_swap_text): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 91781
diff changeset
2183 eassert (!current_buffer->base_buffer);
4a11735d1bdb (Fbuffer_swap_text): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 91781
diff changeset
2184 eassert (!other_buffer->base_buffer);
4a11735d1bdb (Fbuffer_swap_text): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 91781
diff changeset
2185 current_buffer->clip_changed = 1; other_buffer->clip_changed = 1;
4a11735d1bdb (Fbuffer_swap_text): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 91781
diff changeset
2186 swapfield (newline_cache, struct region_cache *);
4a11735d1bdb (Fbuffer_swap_text): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 91781
diff changeset
2187 swapfield (width_run_cache, struct region_cache *);
4a11735d1bdb (Fbuffer_swap_text): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 91781
diff changeset
2188 current_buffer->prevent_redisplay_optimizations_p = 1;
4a11735d1bdb (Fbuffer_swap_text): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 91781
diff changeset
2189 other_buffer->prevent_redisplay_optimizations_p = 1;
4a11735d1bdb (Fbuffer_swap_text): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 91781
diff changeset
2190 swapfield (overlays_before, struct Lisp_Overlay *);
4a11735d1bdb (Fbuffer_swap_text): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 91781
diff changeset
2191 swapfield (overlays_after, struct Lisp_Overlay *);
4a11735d1bdb (Fbuffer_swap_text): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 91781
diff changeset
2192 swapfield (overlay_center, EMACS_INT);
4a11735d1bdb (Fbuffer_swap_text): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 91781
diff changeset
2193 swapfield (undo_list, Lisp_Object);
4a11735d1bdb (Fbuffer_swap_text): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 91781
diff changeset
2194 swapfield (mark, Lisp_Object);
4a11735d1bdb (Fbuffer_swap_text): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 91781
diff changeset
2195 swapfield (enable_multibyte_characters, Lisp_Object);
107605
b1e1b45c9fb6 Retrospective commit from 2009-1219.
Eli Zaretskii <eliz@gnu.org>
parents: 107602
diff changeset
2196 swapfield (bidi_display_reordering, Lisp_Object);
b1e1b45c9fb6 Retrospective commit from 2009-1219.
Eli Zaretskii <eliz@gnu.org>
parents: 107602
diff changeset
2197 swapfield (bidi_paragraph_direction, Lisp_Object);
92215
4a11735d1bdb (Fbuffer_swap_text): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 91781
diff changeset
2198 /* FIXME: Not sure what we should do with these *_marker fields.
4a11735d1bdb (Fbuffer_swap_text): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 91781
diff changeset
2199 Hopefully they're just nil anyway. */
4a11735d1bdb (Fbuffer_swap_text): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 91781
diff changeset
2200 swapfield (pt_marker, Lisp_Object);
4a11735d1bdb (Fbuffer_swap_text): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 91781
diff changeset
2201 swapfield (begv_marker, Lisp_Object);
4a11735d1bdb (Fbuffer_swap_text): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 91781
diff changeset
2202 swapfield (zv_marker, Lisp_Object);
4a11735d1bdb (Fbuffer_swap_text): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 91781
diff changeset
2203 current_buffer->point_before_scroll = Qnil;
4a11735d1bdb (Fbuffer_swap_text): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 91781
diff changeset
2204 other_buffer->point_before_scroll = Qnil;
4a11735d1bdb (Fbuffer_swap_text): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 91781
diff changeset
2205
4a11735d1bdb (Fbuffer_swap_text): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 91781
diff changeset
2206 current_buffer->text->modiff++; other_buffer->text->modiff++;
4a11735d1bdb (Fbuffer_swap_text): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 91781
diff changeset
2207 current_buffer->text->chars_modiff++; other_buffer->text->chars_modiff++;
4a11735d1bdb (Fbuffer_swap_text): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 91781
diff changeset
2208 current_buffer->text->overlay_modiff++; other_buffer->text->overlay_modiff++;
4a11735d1bdb (Fbuffer_swap_text): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 91781
diff changeset
2209 current_buffer->text->beg_unchanged = current_buffer->text->gpt;
4a11735d1bdb (Fbuffer_swap_text): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 91781
diff changeset
2210 current_buffer->text->end_unchanged = current_buffer->text->gpt;
99757
270d85d8daeb (Fbuffer_swap_text): Remove redundant marker manipulation.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 99626
diff changeset
2211 other_buffer->text->beg_unchanged = other_buffer->text->gpt;
270d85d8daeb (Fbuffer_swap_text): Remove redundant marker manipulation.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 99626
diff changeset
2212 other_buffer->text->end_unchanged = other_buffer->text->gpt;
92215
4a11735d1bdb (Fbuffer_swap_text): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 91781
diff changeset
2213 {
4a11735d1bdb (Fbuffer_swap_text): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 91781
diff changeset
2214 struct Lisp_Marker *m;
4a11735d1bdb (Fbuffer_swap_text): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 91781
diff changeset
2215 for (m = BUF_MARKERS (current_buffer); m; m = m->next)
4a11735d1bdb (Fbuffer_swap_text): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 91781
diff changeset
2216 if (m->buffer == other_buffer)
4a11735d1bdb (Fbuffer_swap_text): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 91781
diff changeset
2217 m->buffer = current_buffer;
99757
270d85d8daeb (Fbuffer_swap_text): Remove redundant marker manipulation.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 99626
diff changeset
2218 else
270d85d8daeb (Fbuffer_swap_text): Remove redundant marker manipulation.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 99626
diff changeset
2219 /* Since there's no indirect buffer in sight, markers on
270d85d8daeb (Fbuffer_swap_text): Remove redundant marker manipulation.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 99626
diff changeset
2220 BUF_MARKERS(buf) should either be for `buf' or dead. */
270d85d8daeb (Fbuffer_swap_text): Remove redundant marker manipulation.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 99626
diff changeset
2221 eassert (!m->buffer);
92215
4a11735d1bdb (Fbuffer_swap_text): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 91781
diff changeset
2222 for (m = BUF_MARKERS (other_buffer); m; m = m->next)
4a11735d1bdb (Fbuffer_swap_text): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 91781
diff changeset
2223 if (m->buffer == current_buffer)
4a11735d1bdb (Fbuffer_swap_text): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 91781
diff changeset
2224 m->buffer = other_buffer;
99757
270d85d8daeb (Fbuffer_swap_text): Remove redundant marker manipulation.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 99626
diff changeset
2225 else
270d85d8daeb (Fbuffer_swap_text): Remove redundant marker manipulation.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 99626
diff changeset
2226 /* Since there's no indirect buffer in sight, markers on
270d85d8daeb (Fbuffer_swap_text): Remove redundant marker manipulation.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 99626
diff changeset
2227 BUF_MARKERS(buf) should either be for `buf' or dead. */
270d85d8daeb (Fbuffer_swap_text): Remove redundant marker manipulation.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 99626
diff changeset
2228 eassert (!m->buffer);
92215
4a11735d1bdb (Fbuffer_swap_text): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 91781
diff changeset
2229 }
98070
b0d74e2658b7 (Fbuffer_swap_text): Reset window->point markers.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 97810
diff changeset
2230 { /* Some of the C code expects that w->buffer == w->pointm->buffer.
b0d74e2658b7 (Fbuffer_swap_text): Reset window->point markers.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 97810
diff changeset
2231 So since we just swapped the markers between the two buffers, we need
b0d74e2658b7 (Fbuffer_swap_text): Reset window->point markers.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 97810
diff changeset
2232 to undo the effect of this swap for window markers. */
b0d74e2658b7 (Fbuffer_swap_text): Reset window->point markers.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 97810
diff changeset
2233 Lisp_Object w = Fselected_window (), ws = Qnil;
b0d74e2658b7 (Fbuffer_swap_text): Reset window->point markers.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 97810
diff changeset
2234 Lisp_Object buf1, buf2;
b0d74e2658b7 (Fbuffer_swap_text): Reset window->point markers.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 97810
diff changeset
2235 XSETBUFFER (buf1, current_buffer); XSETBUFFER (buf2, other_buffer);
b0d74e2658b7 (Fbuffer_swap_text): Reset window->point markers.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 97810
diff changeset
2236
b0d74e2658b7 (Fbuffer_swap_text): Reset window->point markers.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 97810
diff changeset
2237 while (NILP (Fmemq (w, ws)))
b0d74e2658b7 (Fbuffer_swap_text): Reset window->point markers.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 97810
diff changeset
2238 {
b0d74e2658b7 (Fbuffer_swap_text): Reset window->point markers.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 97810
diff changeset
2239 ws = Fcons (w, ws);
b0d74e2658b7 (Fbuffer_swap_text): Reset window->point markers.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 97810
diff changeset
2240 if (MARKERP (XWINDOW (w)->pointm)
b0d74e2658b7 (Fbuffer_swap_text): Reset window->point markers.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 97810
diff changeset
2241 && (EQ (XWINDOW (w)->buffer, buf1)
b0d74e2658b7 (Fbuffer_swap_text): Reset window->point markers.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 97810
diff changeset
2242 || EQ (XWINDOW (w)->buffer, buf2)))
b0d74e2658b7 (Fbuffer_swap_text): Reset window->point markers.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 97810
diff changeset
2243 Fset_marker (XWINDOW (w)->pointm,
b0d74e2658b7 (Fbuffer_swap_text): Reset window->point markers.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 97810
diff changeset
2244 make_number (BUF_BEGV (XBUFFER (XWINDOW (w)->buffer))),
b0d74e2658b7 (Fbuffer_swap_text): Reset window->point markers.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 97810
diff changeset
2245 XWINDOW (w)->buffer);
b0d74e2658b7 (Fbuffer_swap_text): Reset window->point markers.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 97810
diff changeset
2246 w = Fnext_window (w, Qt, Qt);
b0d74e2658b7 (Fbuffer_swap_text): Reset window->point markers.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 97810
diff changeset
2247 }
b0d74e2658b7 (Fbuffer_swap_text): Reset window->point markers.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 97810
diff changeset
2248 }
b0d74e2658b7 (Fbuffer_swap_text): Reset window->point markers.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 97810
diff changeset
2249
92215
4a11735d1bdb (Fbuffer_swap_text): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 91781
diff changeset
2250 if (current_buffer->text->intervals)
4a11735d1bdb (Fbuffer_swap_text): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 91781
diff changeset
2251 (eassert (EQ (current_buffer->text->intervals->up.obj, buffer)),
4a11735d1bdb (Fbuffer_swap_text): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 91781
diff changeset
2252 XSETBUFFER (current_buffer->text->intervals->up.obj, current_buffer));
4a11735d1bdb (Fbuffer_swap_text): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 91781
diff changeset
2253 if (other_buffer->text->intervals)
4a11735d1bdb (Fbuffer_swap_text): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 91781
diff changeset
2254 (eassert (EQ (other_buffer->text->intervals->up.obj, Fcurrent_buffer ())),
4a11735d1bdb (Fbuffer_swap_text): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 91781
diff changeset
2255 XSETBUFFER (other_buffer->text->intervals->up.obj, other_buffer));
4a11735d1bdb (Fbuffer_swap_text): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 91781
diff changeset
2256
4a11735d1bdb (Fbuffer_swap_text): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 91781
diff changeset
2257 return Qnil;
4a11735d1bdb (Fbuffer_swap_text): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 91781
diff changeset
2258 }
4a11735d1bdb (Fbuffer_swap_text): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 91781
diff changeset
2259
20679
a9d566444dd4 (Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20586
diff changeset
2260 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
2261 1, 1, 0,
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39974
diff changeset
2262 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
2263 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
2264 If FLAG is nil, this makes the buffer a single-byte buffer.
89483
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 88123 89068
diff changeset
2265 In these cases, the buffer contents remain unchanged as a sequence of
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 88123 89068
diff changeset
2266 bytes but the contents viewed as characters do change.
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 88123 89068
diff changeset
2267 If FLAG is `to', this makes the buffer a multibyte buffer by changing
89909
68c22ea6027c Sync to HEAD
Kenichi Handa <handa@m17n.org>
parents: 89483
diff changeset
2268 all eight-bit bytes to eight-bit characters.
53816
0987c11386f1 (Fset_buffer_multibyte): Fix docstring.
Kenichi Handa <handa@m17n.org>
parents: 53815
diff changeset
2269 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
2270 current buffer is cleared. */)
109179
8cfee7d2955f Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109165
diff changeset
2271 (Lisp_Object flag)
20679
a9d566444dd4 (Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20586
diff changeset
2272 {
51669
f3dc77591fe2 (set_buffer_internal_1): Test CONSP for lists.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51431
diff changeset
2273 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
2274 struct buffer *other;
110545
6ae8bab9b79a Fix int/EMACS_INT use in buffer.c.
Eli Zaretskii <eliz@gnu.org>
parents: 110361
diff changeset
2275 EMACS_INT begv, zv;
51394
d1641e2dfc5b (Fset_buffer_multibyte): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents: 51391
diff changeset
2276 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
2277 int modified_p = !NILP (Fbuffer_modified_p (Qnil));
72486
c5d047643872 2006-08-22 Stefan Monnier <monnier@iro.umontreal.ca>
Kim F. Storm <storm@cua.dk>
parents: 72299
diff changeset
2278 Lisp_Object old_undo = current_buffer->undo_list;
c5d047643872 2006-08-22 Stefan Monnier <monnier@iro.umontreal.ca>
Kim F. Storm <storm@cua.dk>
parents: 72299
diff changeset
2279 struct gcpro gcpro1;
20679
a9d566444dd4 (Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20586
diff changeset
2280
24240
6ea9058180ec (Fset_buffer_multibyte): Error if buffer is multibyte.
Richard M. Stallman <rms@gnu.org>
parents: 23760
diff changeset
2281 if (current_buffer->base_buffer)
6ea9058180ec (Fset_buffer_multibyte): Error if buffer is multibyte.
Richard M. Stallman <rms@gnu.org>
parents: 23760
diff changeset
2282 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
2283
21506
a44f9f59c656 (Fset_buffer_multibyte): Do nothing if nothing actually
Andreas Schwab <schwab@suse.de>
parents: 21244
diff changeset
2284 /* Do nothing if nothing actually changes. */
a44f9f59c656 (Fset_buffer_multibyte): Do nothing if nothing actually
Andreas Schwab <schwab@suse.de>
parents: 21244
diff changeset
2285 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
2286 return flag;
a44f9f59c656 (Fset_buffer_multibyte): Do nothing if nothing actually
Andreas Schwab <schwab@suse.de>
parents: 21244
diff changeset
2287
72486
c5d047643872 2006-08-22 Stefan Monnier <monnier@iro.umontreal.ca>
Kim F. Storm <storm@cua.dk>
parents: 72299
diff changeset
2288 GCPRO1 (old_undo);
c5d047643872 2006-08-22 Stefan Monnier <monnier@iro.umontreal.ca>
Kim F. Storm <storm@cua.dk>
parents: 72299
diff changeset
2289
c5d047643872 2006-08-22 Stefan Monnier <monnier@iro.umontreal.ca>
Kim F. Storm <storm@cua.dk>
parents: 72299
diff changeset
2290 /* Don't record these buffer changes. We will put a special undo entry
c5d047643872 2006-08-22 Stefan Monnier <monnier@iro.umontreal.ca>
Kim F. Storm <storm@cua.dk>
parents: 72299
diff changeset
2291 instead. */
c5d047643872 2006-08-22 Stefan Monnier <monnier@iro.umontreal.ca>
Kim F. Storm <storm@cua.dk>
parents: 72299
diff changeset
2292 current_buffer->undo_list = Qt;
20868
83f23c9f7c4d (advance_to_char_boundary): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20853
diff changeset
2293
20679
a9d566444dd4 (Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20586
diff changeset
2294 /* 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
2295 clear_charpos_cache (current_buffer);
a9d566444dd4 (Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20586
diff changeset
2296
51391
61ea5c492ffb (Fset_buffer_multibyte): Correctly recover a narrowed
Kenichi Handa <handa@m17n.org>
parents: 51318
diff changeset
2297 if (NILP (flag))
61ea5c492ffb (Fset_buffer_multibyte): Correctly recover a narrowed
Kenichi Handa <handa@m17n.org>
parents: 51318
diff changeset
2298 begv = BEGV_BYTE, zv = ZV_BYTE;
61ea5c492ffb (Fset_buffer_multibyte): Correctly recover a narrowed
Kenichi Handa <handa@m17n.org>
parents: 51318
diff changeset
2299 else
61ea5c492ffb (Fset_buffer_multibyte): Correctly recover a narrowed
Kenichi Handa <handa@m17n.org>
parents: 51318
diff changeset
2300 begv = BEGV, zv = ZV;
61ea5c492ffb (Fset_buffer_multibyte): Correctly recover a narrowed
Kenichi Handa <handa@m17n.org>
parents: 51318
diff changeset
2301
28998
d8c9e2f7022f (advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents: 28991
diff changeset
2302 if (narrowed)
d8c9e2f7022f (advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents: 28991
diff changeset
2303 Fwiden ();
d8c9e2f7022f (advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents: 28991
diff changeset
2304
20679
a9d566444dd4 (Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20586
diff changeset
2305 if (NILP (flag))
a9d566444dd4 (Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20586
diff changeset
2306 {
110545
6ae8bab9b79a Fix int/EMACS_INT use in buffer.c.
Eli Zaretskii <eliz@gnu.org>
parents: 110361
diff changeset
2307 EMACS_INT pos, stop;
28998
d8c9e2f7022f (advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents: 28991
diff changeset
2308 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
2309
20679
a9d566444dd4 (Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20586
diff changeset
2310 /* 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
2311 to calculate the old correspondences. */
a9d566444dd4 (Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20586
diff changeset
2312 set_intervals_multibyte (0);
a9d566444dd4 (Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20586
diff changeset
2313
a9d566444dd4 (Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20586
diff changeset
2314 current_buffer->enable_multibyte_characters = Qnil;
a9d566444dd4 (Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20586
diff changeset
2315
a9d566444dd4 (Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20586
diff changeset
2316 Z = Z_BYTE;
a9d566444dd4 (Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20586
diff changeset
2317 BEGV = BEGV_BYTE;
a9d566444dd4 (Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20586
diff changeset
2318 ZV = ZV_BYTE;
a9d566444dd4 (Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20586
diff changeset
2319 GPT = GPT_BYTE;
a9d566444dd4 (Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20586
diff changeset
2320 TEMP_SET_PT_BOTH (PT_BYTE, PT_BYTE);
a9d566444dd4 (Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20586
diff changeset
2321
55242
d57364949309 (syms_of_buffer) <line-spacing>: Allow float value.
Kim F. Storm <storm@cua.dk>
parents: 55140
diff changeset
2322
51669
f3dc77591fe2 (set_buffer_internal_1): Test CONSP for lists.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51431
diff changeset
2323 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
2324 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
2325
d8c9e2f7022f (advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents: 28991
diff changeset
2326 /* 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
2327 pos = BEG;
d8c9e2f7022f (advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents: 28991
diff changeset
2328 stop = GPT;
d8c9e2f7022f (advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents: 28991
diff changeset
2329 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
2330 while (1)
d8c9e2f7022f (advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents: 28991
diff changeset
2331 {
d8c9e2f7022f (advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents: 28991
diff changeset
2332 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
2333
d8c9e2f7022f (advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents: 28991
diff changeset
2334 if (pos == stop)
d8c9e2f7022f (advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents: 28991
diff changeset
2335 {
d8c9e2f7022f (advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents: 28991
diff changeset
2336 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
2337 break;
d8c9e2f7022f (advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents: 28991
diff changeset
2338 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
2339 stop = Z;
d8c9e2f7022f (advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents: 28991
diff changeset
2340 }
88354
8a0cda2f3c85 Include "character.h" instead of "charset.h", don't include
Kenichi Handa <handa@m17n.org>
parents: 42982
diff changeset
2341 if (ASCII_BYTE_P (*p))
8a0cda2f3c85 Include "character.h" instead of "charset.h", don't include
Kenichi Handa <handa@m17n.org>
parents: 42982
diff changeset
2342 p++, pos++;
8a0cda2f3c85 Include "character.h" instead of "charset.h", don't include
Kenichi Handa <handa@m17n.org>
parents: 42982
diff changeset
2343 else if (CHAR_BYTE8_HEAD_P (*p))
28998
d8c9e2f7022f (advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents: 28991
diff changeset
2344 {
106185
f2cea199b0c4 * character.h (STRING_CHAR, STRING_CHAR_AND_LENGTH): Remove
Andreas Schwab <schwab@linux-m68k.org>
parents: 105958
diff changeset
2345 c = STRING_CHAR_AND_LENGTH (p, bytes);
28998
d8c9e2f7022f (advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents: 28991
diff changeset
2346 /* Delete all bytes for this 8-bit character but the
110361
4d54e23aa31e Fix typos in comments and ChangeLogs.
Juanma Barranquero <lekktu@gmail.com>
parents: 109726
diff changeset
2347 last one, and change the last one to the character
28998
d8c9e2f7022f (advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents: 28991
diff changeset
2348 code. */
d8c9e2f7022f (advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents: 28991
diff changeset
2349 bytes--;
d8c9e2f7022f (advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents: 28991
diff changeset
2350 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
2351 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
2352 *p++ = c;
d8c9e2f7022f (advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents: 28991
diff changeset
2353 pos++;
d8c9e2f7022f (advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents: 28991
diff changeset
2354 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
2355 begv -= bytes;
d8c9e2f7022f (advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents: 28991
diff changeset
2356 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
2357 zv -= bytes;
d8c9e2f7022f (advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents: 28991
diff changeset
2358 stop = Z;
d8c9e2f7022f (advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents: 28991
diff changeset
2359 }
89483
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 88123 89068
diff changeset
2360 else
88354
8a0cda2f3c85 Include "character.h" instead of "charset.h", don't include
Kenichi Handa <handa@m17n.org>
parents: 42982
diff changeset
2361 {
8a0cda2f3c85 Include "character.h" instead of "charset.h", don't include
Kenichi Handa <handa@m17n.org>
parents: 42982
diff changeset
2362 bytes = BYTES_BY_CHAR_HEAD (*p);
8a0cda2f3c85 Include "character.h" instead of "charset.h", don't include
Kenichi Handa <handa@m17n.org>
parents: 42982
diff changeset
2363 p += bytes, pos += bytes;
8a0cda2f3c85 Include "character.h" instead of "charset.h", don't include
Kenichi Handa <handa@m17n.org>
parents: 42982
diff changeset
2364 }
28998
d8c9e2f7022f (advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents: 28991
diff changeset
2365 }
d8c9e2f7022f (advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents: 28991
diff changeset
2366 if (narrowed)
d8c9e2f7022f (advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents: 28991
diff changeset
2367 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
2368 }
a9d566444dd4 (Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20586
diff changeset
2369 else
a9d566444dd4 (Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20586
diff changeset
2370 {
110545
6ae8bab9b79a Fix int/EMACS_INT use in buffer.c.
Eli Zaretskii <eliz@gnu.org>
parents: 110361
diff changeset
2371 EMACS_INT pt = PT;
6ae8bab9b79a Fix int/EMACS_INT use in buffer.c.
Eli Zaretskii <eliz@gnu.org>
parents: 110361
diff changeset
2372 EMACS_INT pos, stop;
88354
8a0cda2f3c85 Include "character.h" instead of "charset.h", don't include
Kenichi Handa <handa@m17n.org>
parents: 42982
diff changeset
2373 unsigned char *p, *pend;
28998
d8c9e2f7022f (advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents: 28991
diff changeset
2374
21065
fde58556c616 (Fset_buffer_multibyte): Fix arg for chars_in_text.
Kenichi Handa <handa@m17n.org>
parents: 20995
diff changeset
2375 /* Be sure not to have a multibyte sequence striding over the GAP.
88354
8a0cda2f3c85 Include "character.h" instead of "charset.h", don't include
Kenichi Handa <handa@m17n.org>
parents: 42982
diff changeset
2376 Ex: We change this: "...abc\302 _GAP_ \241def..."
8a0cda2f3c85 Include "character.h" instead of "charset.h", don't include
Kenichi Handa <handa@m17n.org>
parents: 42982
diff changeset
2377 to: "...abc _GAP_ \302\241def..." */
21065
fde58556c616 (Fset_buffer_multibyte): Fix arg for chars_in_text.
Kenichi Handa <handa@m17n.org>
parents: 20995
diff changeset
2378
89483
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 88123 89068
diff changeset
2379 if (EQ (flag, Qt)
88944
8628701201ae (Qas, Qmake, Qto): New variables.
Kenichi Handa <handa@m17n.org>
parents: 88547
diff changeset
2380 && GPT_BYTE > 1 && GPT_BYTE < Z_BYTE
21065
fde58556c616 (Fset_buffer_multibyte): Fix arg for chars_in_text.
Kenichi Handa <handa@m17n.org>
parents: 20995
diff changeset
2381 && ! 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
2382 {
fde58556c616 (Fset_buffer_multibyte): Fix arg for chars_in_text.
Kenichi Handa <handa@m17n.org>
parents: 20995
diff changeset
2383 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
2384
fde58556c616 (Fset_buffer_multibyte): Fix arg for chars_in_text.
Kenichi Handa <handa@m17n.org>
parents: 20995
diff changeset
2385 while (! CHAR_HEAD_P (*p) && p > BEG_ADDR) p--;
108890
d9257436d2b1 Remove obsolete macro BASE_LEADING_CODE_P.
Juanma Barranquero <lekktu@gmail.com>
parents: 108880
diff changeset
2386 if (LEADING_CODE_P (*p))
21065
fde58556c616 (Fset_buffer_multibyte): Fix arg for chars_in_text.
Kenichi Handa <handa@m17n.org>
parents: 20995
diff changeset
2387 {
110545
6ae8bab9b79a Fix int/EMACS_INT use in buffer.c.
Eli Zaretskii <eliz@gnu.org>
parents: 110361
diff changeset
2388 EMACS_INT new_gpt = GPT_BYTE - (GPT_ADDR - p);
21065
fde58556c616 (Fset_buffer_multibyte): Fix arg for chars_in_text.
Kenichi Handa <handa@m17n.org>
parents: 20995
diff changeset
2389
fde58556c616 (Fset_buffer_multibyte): Fix arg for chars_in_text.
Kenichi Handa <handa@m17n.org>
parents: 20995
diff changeset
2390 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
2391 }
fde58556c616 (Fset_buffer_multibyte): Fix arg for chars_in_text.
Kenichi Handa <handa@m17n.org>
parents: 20995
diff changeset
2392 }
fde58556c616 (Fset_buffer_multibyte): Fix arg for chars_in_text.
Kenichi Handa <handa@m17n.org>
parents: 20995
diff changeset
2393
28998
d8c9e2f7022f (advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents: 28991
diff changeset
2394 /* 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
2395 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
2396 pos = BEG;
d8c9e2f7022f (advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents: 28991
diff changeset
2397 stop = GPT;
d8c9e2f7022f (advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents: 28991
diff changeset
2398 p = BEG_ADDR;
88354
8a0cda2f3c85 Include "character.h" instead of "charset.h", don't include
Kenichi Handa <handa@m17n.org>
parents: 42982
diff changeset
2399 pend = GPT_ADDR;
28998
d8c9e2f7022f (advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents: 28991
diff changeset
2400 while (1)
d8c9e2f7022f (advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents: 28991
diff changeset
2401 {
d8c9e2f7022f (advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents: 28991
diff changeset
2402 int bytes;
d8c9e2f7022f (advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents: 28991
diff changeset
2403
d8c9e2f7022f (advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents: 28991
diff changeset
2404 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
2405 {
d8c9e2f7022f (advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents: 28991
diff changeset
2406 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
2407 break;
d8c9e2f7022f (advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents: 28991
diff changeset
2408 p = GAP_END_ADDR;
88354
8a0cda2f3c85 Include "character.h" instead of "charset.h", don't include
Kenichi Handa <handa@m17n.org>
parents: 42982
diff changeset
2409 pend = Z_ADDR;
28998
d8c9e2f7022f (advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents: 28991
diff changeset
2410 stop = Z;
d8c9e2f7022f (advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents: 28991
diff changeset
2411 }
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49444
diff changeset
2412
88944
8628701201ae (Qas, Qmake, Qto): New variables.
Kenichi Handa <handa@m17n.org>
parents: 88547
diff changeset
2413 if (ASCII_BYTE_P (*p))
8628701201ae (Qas, Qmake, Qto): New variables.
Kenichi Handa <handa@m17n.org>
parents: 88547
diff changeset
2414 p++, pos++;
107311
cdeadbfdda61 buffer.c (Fset_buffer_multibyte): Fix handling of the multibyte form of raw-bytes.
Kenichi Handa <handa@m17n.org>
parents: 106813
diff changeset
2415 else if (EQ (flag, Qt)
cdeadbfdda61 buffer.c (Fset_buffer_multibyte): Fix handling of the multibyte form of raw-bytes.
Kenichi Handa <handa@m17n.org>
parents: 106813
diff changeset
2416 && ! CHAR_BYTE8_HEAD_P (*p)
cdeadbfdda61 buffer.c (Fset_buffer_multibyte): Fix handling of the multibyte form of raw-bytes.
Kenichi Handa <handa@m17n.org>
parents: 106813
diff changeset
2417 && (bytes = MULTIBYTE_LENGTH (p, pend)) > 0)
28998
d8c9e2f7022f (advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents: 28991
diff changeset
2418 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
2419 else
d8c9e2f7022f (advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents: 28991
diff changeset
2420 {
d8c9e2f7022f (advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents: 28991
diff changeset
2421 unsigned char tmp[MAX_MULTIBYTE_LENGTH];
88944
8628701201ae (Qas, Qmake, Qto): New variables.
Kenichi Handa <handa@m17n.org>
parents: 88547
diff changeset
2422 int c;
8628701201ae (Qas, Qmake, Qto): New variables.
Kenichi Handa <handa@m17n.org>
parents: 88547
diff changeset
2423
89483
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 88123 89068
diff changeset
2424 c = BYTE8_TO_CHAR (*p);
88507
e3a506b5f300 (Fset_buffer_multibyte): Convert 8-bit bytes to
Kenichi Handa <handa@m17n.org>
parents: 88453
diff changeset
2425 bytes = CHAR_STRING (c, tmp);
28998
d8c9e2f7022f (advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents: 28991
diff changeset
2426 *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
2427 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
2428 bytes--;
d8c9e2f7022f (advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents: 28991
diff changeset
2429 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
2430 /* 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
2431 pos = GPT;
d8c9e2f7022f (advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents: 28991
diff changeset
2432 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
2433 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
2434 begv += bytes;
d8c9e2f7022f (advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents: 28991
diff changeset
2435 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
2436 zv += bytes;
d8c9e2f7022f (advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents: 28991
diff changeset
2437 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
2438 pt += bytes;
88453
4e78ee207f40 (Fset_buffer_multibyte): Fix 8-bit char handling.
Kenichi Handa <handa@m17n.org>
parents: 88354
diff changeset
2439 pend = Z_ADDR;
28998
d8c9e2f7022f (advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents: 28991
diff changeset
2440 stop = Z;
d8c9e2f7022f (advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents: 28991
diff changeset
2441 }
d8c9e2f7022f (advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents: 28991
diff changeset
2442 }
d8c9e2f7022f (advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents: 28991
diff changeset
2443
d8c9e2f7022f (advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents: 28991
diff changeset
2444 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
2445 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
2446
d8c9e2f7022f (advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents: 28991
diff changeset
2447 if (narrowed)
d8c9e2f7022f (advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents: 28991
diff changeset
2448 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
2449
20679
a9d566444dd4 (Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20586
diff changeset
2450 /* 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
2451 set_intervals_multibyte needs it too. */
a9d566444dd4 (Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20586
diff changeset
2452 current_buffer->enable_multibyte_characters = Qt;
a9d566444dd4 (Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20586
diff changeset
2453
20868
83f23c9f7c4d (advance_to_char_boundary): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20853
diff changeset
2454 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
2455 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
2456
21065
fde58556c616 (Fset_buffer_multibyte): Fix arg for chars_in_text.
Kenichi Handa <handa@m17n.org>
parents: 20995
diff changeset
2457 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
2458
83f23c9f7c4d (advance_to_char_boundary): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20853
diff changeset
2459 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
2460 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
2461 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
2462 else
a9d566444dd4 (Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20586
diff changeset
2463 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
2464
83f23c9f7c4d (advance_to_char_boundary): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20853
diff changeset
2465 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
2466 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
2467 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
2468 else
a9d566444dd4 (Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20586
diff changeset
2469 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
2470
83f23c9f7c4d (advance_to_char_boundary): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20853
diff changeset
2471 {
110545
6ae8bab9b79a Fix int/EMACS_INT use in buffer.c.
Eli Zaretskii <eliz@gnu.org>
parents: 110361
diff changeset
2472 EMACS_INT pt_byte = advance_to_char_boundary (PT_BYTE);
6ae8bab9b79a Fix int/EMACS_INT use in buffer.c.
Eli Zaretskii <eliz@gnu.org>
parents: 110361
diff changeset
2473 EMACS_INT pt;
20868
83f23c9f7c4d (advance_to_char_boundary): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20853
diff changeset
2474
83f23c9f7c4d (advance_to_char_boundary): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20853
diff changeset
2475 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
2476 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
2477 else
83f23c9f7c4d (advance_to_char_boundary): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20853
diff changeset
2478 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
2479 TEMP_SET_PT_BOTH (pt, pt_byte);
83f23c9f7c4d (advance_to_char_boundary): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20853
diff changeset
2480 }
20679
a9d566444dd4 (Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20586
diff changeset
2481
a9d566444dd4 (Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20586
diff changeset
2482 tail = markers = BUF_MARKERS (current_buffer);
22021
55fc60b09fa7 Comment change.
Richard M. Stallman <rms@gnu.org>
parents: 21969
diff changeset
2483
55fc60b09fa7 Comment change.
Richard M. Stallman <rms@gnu.org>
parents: 21969
diff changeset
2484 /* 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
2485 getting confused by the markers that have not yet been updated.
55fc60b09fa7 Comment change.
Richard M. Stallman <rms@gnu.org>
parents: 21969
diff changeset
2486 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
2487 BUF_MARKERS (current_buffer) = NULL;
f3dc77591fe2 (set_buffer_internal_1): Test CONSP for lists.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51431
diff changeset
2488
f3dc77591fe2 (set_buffer_internal_1): Test CONSP for lists.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51431
diff changeset
2489 for (; tail; tail = tail->next)
20679
a9d566444dd4 (Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20586
diff changeset
2490 {
51669
f3dc77591fe2 (set_buffer_internal_1): Test CONSP for lists.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51431
diff changeset
2491 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
2492 tail->charpos = BYTE_TO_CHAR (tail->bytepos);
20679
a9d566444dd4 (Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20586
diff changeset
2493 }
22023
8c00a2d112cc (Fset_buffer_multibyte): Error if marker is put
Richard M. Stallman <rms@gnu.org>
parents: 22021
diff changeset
2494
8c00a2d112cc (Fset_buffer_multibyte): Error if marker is put
Richard M. Stallman <rms@gnu.org>
parents: 22021
diff changeset
2495 /* 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
2496 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
2497 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
2498 abort ();
8c00a2d112cc (Fset_buffer_multibyte): Error if marker is put
Richard M. Stallman <rms@gnu.org>
parents: 22021
diff changeset
2499
20679
a9d566444dd4 (Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20586
diff changeset
2500 BUF_MARKERS (current_buffer) = markers;
a9d566444dd4 (Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20586
diff changeset
2501
a9d566444dd4 (Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20586
diff changeset
2502 /* 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
2503 between chars and bytes. */
a9d566444dd4 (Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20586
diff changeset
2504 set_intervals_multibyte (1);
a9d566444dd4 (Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20586
diff changeset
2505 }
a9d566444dd4 (Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20586
diff changeset
2506
72486
c5d047643872 2006-08-22 Stefan Monnier <monnier@iro.umontreal.ca>
Kim F. Storm <storm@cua.dk>
parents: 72299
diff changeset
2507 if (!EQ (old_undo, Qt))
c5d047643872 2006-08-22 Stefan Monnier <monnier@iro.umontreal.ca>
Kim F. Storm <storm@cua.dk>
parents: 72299
diff changeset
2508 {
c5d047643872 2006-08-22 Stefan Monnier <monnier@iro.umontreal.ca>
Kim F. Storm <storm@cua.dk>
parents: 72299
diff changeset
2509 /* Represent all the above changes by a special undo entry. */
72532
71e0aa245bce (Fset_buffer_multibyte): Simplify; use list3.
Kim F. Storm <storm@cua.dk>
parents: 72524
diff changeset
2510 current_buffer->undo_list = Fcons (list3 (Qapply,
71e0aa245bce (Fset_buffer_multibyte): Simplify; use list3.
Kim F. Storm <storm@cua.dk>
parents: 72524
diff changeset
2511 intern ("set-buffer-multibyte"),
71e0aa245bce (Fset_buffer_multibyte): Simplify; use list3.
Kim F. Storm <storm@cua.dk>
parents: 72524
diff changeset
2512 NILP (flag) ? Qt : Qnil),
71e0aa245bce (Fset_buffer_multibyte): Simplify; use list3.
Kim F. Storm <storm@cua.dk>
parents: 72524
diff changeset
2513 old_undo);
72486
c5d047643872 2006-08-22 Stefan Monnier <monnier@iro.umontreal.ca>
Kim F. Storm <storm@cua.dk>
parents: 72299
diff changeset
2514 }
c5d047643872 2006-08-22 Stefan Monnier <monnier@iro.umontreal.ca>
Kim F. Storm <storm@cua.dk>
parents: 72299
diff changeset
2515
c5d047643872 2006-08-22 Stefan Monnier <monnier@iro.umontreal.ca>
Kim F. Storm <storm@cua.dk>
parents: 72299
diff changeset
2516 UNGCPRO;
28998
d8c9e2f7022f (advance_to_char_boundary): Don't use DEC_POS to find a
Kenichi Handa <handa@m17n.org>
parents: 28991
diff changeset
2517
26970
7b3d9b3a9d69 (Fset_buffer_multibyte): Arrange for a thorough
Gerd Moellmann <gerd@gnu.org>
parents: 26555
diff changeset
2518 /* 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
2519 showing that buffer must be updated thoroughly. */
7b3d9b3a9d69 (Fset_buffer_multibyte): Arrange for a thorough
Gerd Moellmann <gerd@gnu.org>
parents: 26555
diff changeset
2520 current_buffer->prevent_redisplay_optimizations_p = 1;
7b3d9b3a9d69 (Fset_buffer_multibyte): Arrange for a thorough
Gerd Moellmann <gerd@gnu.org>
parents: 26555
diff changeset
2521 ++windows_or_buffers_changed;
7b3d9b3a9d69 (Fset_buffer_multibyte): Arrange for a thorough
Gerd Moellmann <gerd@gnu.org>
parents: 26555
diff changeset
2522
24604
a9eb0deae6c0 (Fmake_indirect_buffer): Copy multibyte status from the base buffer.
Richard M. Stallman <rms@gnu.org>
parents: 24520
diff changeset
2523 /* 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
2524 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
2525 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
2526 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
2527 {
7b3d9b3a9d69 (Fset_buffer_multibyte): Arrange for a thorough
Gerd Moellmann <gerd@gnu.org>
parents: 26555
diff changeset
2528 other->enable_multibyte_characters
7b3d9b3a9d69 (Fset_buffer_multibyte): Arrange for a thorough
Gerd Moellmann <gerd@gnu.org>
parents: 26555
diff changeset
2529 = current_buffer->enable_multibyte_characters;
7b3d9b3a9d69 (Fset_buffer_multibyte): Arrange for a thorough
Gerd Moellmann <gerd@gnu.org>
parents: 26555
diff changeset
2530 other->prevent_redisplay_optimizations_p = 1;
7b3d9b3a9d69 (Fset_buffer_multibyte): Arrange for a thorough
Gerd Moellmann <gerd@gnu.org>
parents: 26555
diff changeset
2531 }
24604
a9eb0deae6c0 (Fmake_indirect_buffer): Copy multibyte status from the base buffer.
Richard M. Stallman <rms@gnu.org>
parents: 24520
diff changeset
2532
29456
1aa0c1122f75 (Fset_buffer_multibyte): Don't make the current buffer as modified if
Kenichi Handa <handa@m17n.org>
parents: 29380
diff changeset
2533 /* 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
2534 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
2535 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
2536
49664
8bcbac2617a9 (Fset_buffer_multibyte): If the current buffer has a
Kenichi Handa <handa@m17n.org>
parents: 49600
diff changeset
2537 /* 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
2538 {
8bcbac2617a9 (Fset_buffer_multibyte): If the current buffer has a
Kenichi Handa <handa@m17n.org>
parents: 49600
diff changeset
2539 Lisp_Object process;
8bcbac2617a9 (Fset_buffer_multibyte): If the current buffer has a
Kenichi Handa <handa@m17n.org>
parents: 49600
diff changeset
2540
8bcbac2617a9 (Fset_buffer_multibyte): If the current buffer has a
Kenichi Handa <handa@m17n.org>
parents: 49600
diff changeset
2541 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
2542 if (PROCESSP (process))
8bcbac2617a9 (Fset_buffer_multibyte): If the current buffer has a
Kenichi Handa <handa@m17n.org>
parents: 49600
diff changeset
2543 setup_process_coding_systems (process);
8bcbac2617a9 (Fset_buffer_multibyte): If the current buffer has a
Kenichi Handa <handa@m17n.org>
parents: 49600
diff changeset
2544 }
8bcbac2617a9 (Fset_buffer_multibyte): If the current buffer has a
Kenichi Handa <handa@m17n.org>
parents: 49600
diff changeset
2545
20679
a9d566444dd4 (Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20586
diff changeset
2546 return flag;
a9d566444dd4 (Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20586
diff changeset
2547 }
a9d566444dd4 (Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20586
diff changeset
2548
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
2549 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
2550 0, 0, 0,
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39974
diff changeset
2551 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
2552 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
2553 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
2554 `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
2555 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
2556 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
2557
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
2558 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
2559 calling this function.
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
2560
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
2561 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
2562 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
2563
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
2564 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
2565 the normal hook `change-major-mode-hook'. */)
109179
8cfee7d2955f Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109165
diff changeset
2566 (void)
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
2567 {
6205
88e41d7d1e27 (Fkill_buffer, Fkill_all_local_variables):
Richard M. Stallman <rms@gnu.org>
parents: 6169
diff changeset
2568 if (!NILP (Vrun_hooks))
72299
e97bfa736263 * buffer.c (Vchange_major_mode_hook, Qchange_major_mode_hook): New vars.
Chong Yidong <cyd@stupidchicken.com>
parents: 71968
diff changeset
2569 call1 (Vrun_hooks, Qchange_major_mode_hook);
87218
409f76c92cb2 (reset_buffer_local_variables): If permanent_too is 0, also
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 87215
diff changeset
2570
409f76c92cb2 (reset_buffer_local_variables): If permanent_too is 0, also
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 87215
diff changeset
2571 /* Make sure none of the bindings in local_var_alist
11214
b880572ce431 (Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents: 11112
diff changeset
2572 remain swapped in, in their symbols. */
b880572ce431 (Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents: 11112
diff changeset
2573
b880572ce431 (Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents: 11112
diff changeset
2574 swap_out_buffer_local_variables (current_buffer);
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
2575
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
2576 /* Actually eliminate all local bindings of this buffer. */
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
2577
15776
6018e01d4466 (buffer_permanent_local_flags): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 15638
diff changeset
2578 reset_buffer_local_variables (current_buffer, 0);
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
2579
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
2580 /* Force mode-line redisplay. Useful here because all major mode
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
2581 commands call this function. */
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
2582 update_mode_lines++;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
2583
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
2584 return Qnil;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
2585 }
11214
b880572ce431 (Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents: 11112
diff changeset
2586
b880572ce431 (Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents: 11112
diff changeset
2587 /* 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
2588 for their current values. */
b880572ce431 (Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents: 11112
diff changeset
2589
b880572ce431 (Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents: 11112
diff changeset
2590 static void
109144
7dceae91724c Convert most remaining function definitions to standard C.
Juanma Barranquero <lekktu@gmail.com>
parents: 109100
diff changeset
2591 swap_out_buffer_local_variables (struct buffer *b)
11214
b880572ce431 (Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents: 11112
diff changeset
2592 {
107984
bef5d1738c0b Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 107845
diff changeset
2593 Lisp_Object oalist, alist, buffer;
11214
b880572ce431 (Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents: 11112
diff changeset
2594
b880572ce431 (Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents: 11112
diff changeset
2595 XSETBUFFER (buffer, b);
b880572ce431 (Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents: 11112
diff changeset
2596 oalist = b->local_var_alist;
b880572ce431 (Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents: 11112
diff changeset
2597
85328
d0d527210b0c * lisp.h (enum Lisp_Misc_Type): Del Lisp_Misc_Some_Buffer_Local_Value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 85296
diff changeset
2598 for (alist = oalist; CONSP (alist); alist = XCDR (alist))
11214
b880572ce431 (Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents: 11112
diff changeset
2599 {
107984
bef5d1738c0b Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 107845
diff changeset
2600 Lisp_Object sym = XCAR (XCAR (alist));
bef5d1738c0b Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 107845
diff changeset
2601 eassert (XSYMBOL (sym)->redirect == SYMBOL_LOCALIZED);
bef5d1738c0b Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 107845
diff changeset
2602 /* Need not do anything if some other buffer's binding is
bef5d1738c0b Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 107845
diff changeset
2603 now encached. */
bef5d1738c0b Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 107845
diff changeset
2604 if (EQ (SYMBOL_BLV (XSYMBOL (sym))->where, buffer))
11214
b880572ce431 (Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents: 11112
diff changeset
2605 {
86230
79043dac5524 (Fbuffer_local_value): Remove redundant test.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 85328
diff changeset
2606 /* Symbol is set up for this buffer's old local value:
79043dac5524 (Fbuffer_local_value): Remove redundant test.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 85328
diff changeset
2607 swap it out! */
107984
bef5d1738c0b Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 107845
diff changeset
2608 swap_in_global_binding (XSYMBOL (sym));
11214
b880572ce431 (Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents: 11112
diff changeset
2609 }
b880572ce431 (Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents: 11112
diff changeset
2610 }
b880572ce431 (Fkill_buffer): Call reset_buffer_local_variables
Richard M. Stallman <rms@gnu.org>
parents: 11112
diff changeset
2611 }
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
2612
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
2613 /* 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
2614 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
2615 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
2616 Store in *NEXT_PTR the next position after POS where an overlay starts,
70697
d6f5b85d7429 (Fprevious_overlay_change, Fnext_overlay_change): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 69154
diff changeset
2617 or ZV if there are no more overlays between POS and ZV.
11693
efef31f1c42d (Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents: 11659
diff changeset
2618 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
2619 or where an overlay starts which ends at or after POS;
70697
d6f5b85d7429 (Fprevious_overlay_change, Fnext_overlay_change): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 69154
diff changeset
2620 or BEGV if there are no such overlays from BEGV to POS.
8967
80b92977ed08 (overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents: 8924
diff changeset
2621 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
2622
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
2623 *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
2624 when this function is called.
8c43cc245dd2 (overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents: 2791
diff changeset
2625
8c43cc245dd2 (overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents: 2791
diff changeset
2626 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
2627 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
2628 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
2629 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
2630
48cc3d076524 (overlays_at): Add CHANGE_REQ parameter.
Miles Bader <miles@gnu.org>
parents: 30360
diff changeset
2631 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
2632 *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
2633 default (BEGV or ZV). */
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
2634
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
2635 int
109144
7dceae91724c Convert most remaining function definitions to standard C.
Juanma Barranquero <lekktu@gmail.com>
parents: 109100
diff changeset
2636 overlays_at (EMACS_INT pos, int extend, Lisp_Object **vec_ptr, int *len_ptr,
7dceae91724c Convert most remaining function definitions to standard C.
Juanma Barranquero <lekktu@gmail.com>
parents: 109100
diff changeset
2637 EMACS_INT *next_ptr, EMACS_INT *prev_ptr, int change_req)
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
2638 {
51844
c5036e7cc93b (overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51827
diff changeset
2639 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
2640 struct Lisp_Overlay *tail;
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
2641 int idx = 0;
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
2642 int len = *len_ptr;
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
2643 Lisp_Object *vec = *vec_ptr;
110545
6ae8bab9b79a Fix int/EMACS_INT use in buffer.c.
Eli Zaretskii <eliz@gnu.org>
parents: 110361
diff changeset
2644 EMACS_INT next = ZV;
6ae8bab9b79a Fix int/EMACS_INT use in buffer.c.
Eli Zaretskii <eliz@gnu.org>
parents: 110361
diff changeset
2645 EMACS_INT prev = BEGV;
2839
8c43cc245dd2 (overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents: 2791
diff changeset
2646 int inhibit_storing = 0;
8c43cc245dd2 (overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents: 2791
diff changeset
2647
51844
c5036e7cc93b (overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51827
diff changeset
2648 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
2649 {
110545
6ae8bab9b79a Fix int/EMACS_INT use in buffer.c.
Eli Zaretskii <eliz@gnu.org>
parents: 110361
diff changeset
2650 EMACS_INT startpos, endpos;
2776
8bf3bb4c20dd * lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents: 2722
diff changeset
2651
51844
c5036e7cc93b (overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51827
diff changeset
2652 XSETMISC (overlay, tail);
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
2653
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
2654 start = OVERLAY_START (overlay);
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
2655 end = OVERLAY_END (overlay);
8967
80b92977ed08 (overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents: 8924
diff changeset
2656 endpos = OVERLAY_POSITION (end);
80b92977ed08 (overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents: 8924
diff changeset
2657 if (endpos < pos)
80b92977ed08 (overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents: 8924
diff changeset
2658 {
80b92977ed08 (overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents: 8924
diff changeset
2659 if (prev < endpos)
80b92977ed08 (overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents: 8924
diff changeset
2660 prev = endpos;
80b92977ed08 (overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents: 8924
diff changeset
2661 break;
80b92977ed08 (overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents: 8924
diff changeset
2662 }
25184
290fceb2b1c0 (switch_to_buffer_1): New subroutine, taken out from Fswitch_to_buffer.
Richard M. Stallman <rms@gnu.org>
parents: 25181
diff changeset
2663 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
2664 /* 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
2665 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
2666 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
2667 prev = startpos;
8967
80b92977ed08 (overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents: 8924
diff changeset
2668 if (endpos == pos)
80b92977ed08 (overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents: 8924
diff changeset
2669 continue;
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
2670 if (startpos <= pos)
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
2671 {
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
2672 if (idx == len)
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
2673 {
2839
8c43cc245dd2 (overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents: 2791
diff changeset
2674 /* The supplied vector is full.
8c43cc245dd2 (overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents: 2791
diff changeset
2675 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
2676 if (extend)
8c43cc245dd2 (overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents: 2791
diff changeset
2677 {
25021
7a31786a0335 (init_buffer_once): Init top_line_format.
Gerd Moellmann <gerd@gnu.org>
parents: 24975
diff changeset
2678 /* 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
2679 len *= 2;
7a31786a0335 (init_buffer_once): Init top_line_format.
Gerd Moellmann <gerd@gnu.org>
parents: 24975
diff changeset
2680 if (len == 0)
7a31786a0335 (init_buffer_once): Init top_line_format.
Gerd Moellmann <gerd@gnu.org>
parents: 24975
diff changeset
2681 len = 4;
7a31786a0335 (init_buffer_once): Init top_line_format.
Gerd Moellmann <gerd@gnu.org>
parents: 24975
diff changeset
2682 *len_ptr = len;
2839
8c43cc245dd2 (overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents: 2791
diff changeset
2683 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
2684 *vec_ptr = vec;
8c43cc245dd2 (overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents: 2791
diff changeset
2685 }
8c43cc245dd2 (overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents: 2791
diff changeset
2686 else
8c43cc245dd2 (overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents: 2791
diff changeset
2687 inhibit_storing = 1;
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
2688 }
2839
8c43cc245dd2 (overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents: 2791
diff changeset
2689
8c43cc245dd2 (overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents: 2791
diff changeset
2690 if (!inhibit_storing)
8c43cc245dd2 (overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents: 2791
diff changeset
2691 vec[idx] = overlay;
8c43cc245dd2 (overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents: 2791
diff changeset
2692 /* 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
2693 idx++;
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
2694 }
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
2695 else if (startpos < next)
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
2696 next = startpos;
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
2697 }
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
2698
51844
c5036e7cc93b (overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51827
diff changeset
2699 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
2700 {
110545
6ae8bab9b79a Fix int/EMACS_INT use in buffer.c.
Eli Zaretskii <eliz@gnu.org>
parents: 110361
diff changeset
2701 EMACS_INT startpos, endpos;
2776
8bf3bb4c20dd * lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents: 2722
diff changeset
2702
51844
c5036e7cc93b (overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51827
diff changeset
2703 XSETMISC (overlay, tail);
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
2704
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
2705 start = OVERLAY_START (overlay);
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
2706 end = OVERLAY_END (overlay);
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
2707 startpos = OVERLAY_POSITION (start);
2776
8bf3bb4c20dd * lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents: 2722
diff changeset
2708 if (pos < startpos)
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
2709 {
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
2710 if (startpos < next)
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
2711 next = startpos;
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
2712 break;
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
2713 }
8967
80b92977ed08 (overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents: 8924
diff changeset
2714 endpos = OVERLAY_POSITION (end);
80b92977ed08 (overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents: 8924
diff changeset
2715 if (pos < endpos)
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
2716 {
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
2717 if (idx == len)
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
2718 {
2839
8c43cc245dd2 (overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents: 2791
diff changeset
2719 if (extend)
8c43cc245dd2 (overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents: 2791
diff changeset
2720 {
46920
a92cb918558c (overlays_at): Handle extending vec uniformly.
Richard M. Stallman <rms@gnu.org>
parents: 46864
diff changeset
2721 /* 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
2722 len *= 2;
25021
7a31786a0335 (init_buffer_once): Init top_line_format.
Gerd Moellmann <gerd@gnu.org>
parents: 24975
diff changeset
2723 if (len == 0)
46920
a92cb918558c (overlays_at): Handle extending vec uniformly.
Richard M. Stallman <rms@gnu.org>
parents: 46864
diff changeset
2724 len = 4;
a92cb918558c (overlays_at): Handle extending vec uniformly.
Richard M. Stallman <rms@gnu.org>
parents: 46864
diff changeset
2725 *len_ptr = len;
2839
8c43cc245dd2 (overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents: 2791
diff changeset
2726 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
2727 *vec_ptr = vec;
8c43cc245dd2 (overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents: 2791
diff changeset
2728 }
8c43cc245dd2 (overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents: 2791
diff changeset
2729 else
8c43cc245dd2 (overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents: 2791
diff changeset
2730 inhibit_storing = 1;
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
2731 }
2839
8c43cc245dd2 (overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents: 2791
diff changeset
2732
8c43cc245dd2 (overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents: 2791
diff changeset
2733 if (!inhibit_storing)
8c43cc245dd2 (overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents: 2791
diff changeset
2734 vec[idx] = overlay;
8c43cc245dd2 (overlays_at): New arg EXTEND.
Richard M. Stallman <rms@gnu.org>
parents: 2791
diff changeset
2735 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
2736
290fceb2b1c0 (switch_to_buffer_1): New subroutine, taken out from Fswitch_to_buffer.
Richard M. Stallman <rms@gnu.org>
parents: 25181
diff changeset
2737 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
2738 prev = startpos;
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
2739 }
8967
80b92977ed08 (overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents: 8924
diff changeset
2740 else if (endpos < pos && endpos > prev)
80b92977ed08 (overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents: 8924
diff changeset
2741 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
2742 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
2743 && (!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
2744 prev = startpos;
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
2745 }
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
2746
8967
80b92977ed08 (overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents: 8924
diff changeset
2747 if (next_ptr)
80b92977ed08 (overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents: 8924
diff changeset
2748 *next_ptr = next;
80b92977ed08 (overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents: 8924
diff changeset
2749 if (prev_ptr)
80b92977ed08 (overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents: 8924
diff changeset
2750 *prev_ptr = prev;
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
2751 return idx;
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
2752 }
12382
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
2753
92975
ca18807830f1 (overlays_in, Foverlays_in): Include empty overlays
Martin Rudalics <rudalics@gmx.at>
parents: 92767
diff changeset
2754 /* Find all the overlays in the current buffer that overlap the range
ca18807830f1 (overlays_in, Foverlays_in): Include empty overlays
Martin Rudalics <rudalics@gmx.at>
parents: 92767
diff changeset
2755 BEG-END, or are empty at BEG, or are empty at END provided END
ca18807830f1 (overlays_in, Foverlays_in): Include empty overlays
Martin Rudalics <rudalics@gmx.at>
parents: 92767
diff changeset
2756 denotes the position at the end of the current buffer.
12488
71aa23be0228 (overlays_in): Don't count empty overlays at END.
Richard M. Stallman <rms@gnu.org>
parents: 12382
diff changeset
2757
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49444
diff changeset
2758 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
2759 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
2760 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
2761 or ZV if there are no more overlays.
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
2762 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
2763 or BEGV if there are no previous overlays.
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
2764 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
2765
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
2766 *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
2767 when this function is called.
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
2768
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
2769 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
2770 If EXTEND is zero, we never extend the vector,
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
2771 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
2772 But we still return the total number of overlays. */
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
2773
50304
d9d826db650f (overlays_in): Declare static.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50014
diff changeset
2774 static int
110545
6ae8bab9b79a Fix int/EMACS_INT use in buffer.c.
Eli Zaretskii <eliz@gnu.org>
parents: 110361
diff changeset
2775 overlays_in (EMACS_INT beg, EMACS_INT end, int extend,
6ae8bab9b79a Fix int/EMACS_INT use in buffer.c.
Eli Zaretskii <eliz@gnu.org>
parents: 110361
diff changeset
2776 Lisp_Object **vec_ptr, int *len_ptr,
6ae8bab9b79a Fix int/EMACS_INT use in buffer.c.
Eli Zaretskii <eliz@gnu.org>
parents: 110361
diff changeset
2777 EMACS_INT *next_ptr, EMACS_INT *prev_ptr)
12382
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
2778 {
51844
c5036e7cc93b (overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51827
diff changeset
2779 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
2780 struct Lisp_Overlay *tail;
12382
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
2781 int idx = 0;
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
2782 int len = *len_ptr;
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
2783 Lisp_Object *vec = *vec_ptr;
110545
6ae8bab9b79a Fix int/EMACS_INT use in buffer.c.
Eli Zaretskii <eliz@gnu.org>
parents: 110361
diff changeset
2784 EMACS_INT next = ZV;
6ae8bab9b79a Fix int/EMACS_INT use in buffer.c.
Eli Zaretskii <eliz@gnu.org>
parents: 110361
diff changeset
2785 EMACS_INT prev = BEGV;
12382
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
2786 int inhibit_storing = 0;
92975
ca18807830f1 (overlays_in, Foverlays_in): Include empty overlays
Martin Rudalics <rudalics@gmx.at>
parents: 92767
diff changeset
2787 int end_is_Z = end == Z;
12382
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
2788
51844
c5036e7cc93b (overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51827
diff changeset
2789 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
2790 {
110545
6ae8bab9b79a Fix int/EMACS_INT use in buffer.c.
Eli Zaretskii <eliz@gnu.org>
parents: 110361
diff changeset
2791 EMACS_INT startpos, endpos;
12382
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
2792
51844
c5036e7cc93b (overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51827
diff changeset
2793 XSETMISC (overlay, tail);
12382
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
2794
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
2795 ostart = OVERLAY_START (overlay);
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
2796 oend = OVERLAY_END (overlay);
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
2797 endpos = OVERLAY_POSITION (oend);
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
2798 if (endpos < beg)
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
2799 {
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
2800 if (prev < endpos)
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
2801 prev = endpos;
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
2802 break;
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
2803 }
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
2804 startpos = OVERLAY_POSITION (ostart);
92975
ca18807830f1 (overlays_in, Foverlays_in): Include empty overlays
Martin Rudalics <rudalics@gmx.at>
parents: 92767
diff changeset
2805 /* Count an interval if it overlaps the range, is empty at the
ca18807830f1 (overlays_in, Foverlays_in): Include empty overlays
Martin Rudalics <rudalics@gmx.at>
parents: 92767
diff changeset
2806 start of the range, or is empty at END provided END denotes the
ca18807830f1 (overlays_in, Foverlays_in): Include empty overlays
Martin Rudalics <rudalics@gmx.at>
parents: 92767
diff changeset
2807 end of the buffer. */
12382
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
2808 if ((beg < endpos && startpos < end)
92975
ca18807830f1 (overlays_in, Foverlays_in): Include empty overlays
Martin Rudalics <rudalics@gmx.at>
parents: 92767
diff changeset
2809 || (startpos == endpos
ca18807830f1 (overlays_in, Foverlays_in): Include empty overlays
Martin Rudalics <rudalics@gmx.at>
parents: 92767
diff changeset
2810 && (beg == endpos || (end_is_Z && endpos == end))))
12382
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
2811 {
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
2812 if (idx == len)
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
2813 {
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
2814 /* The supplied vector is full.
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
2815 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
2816 if (extend)
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
2817 {
46920
a92cb918558c (overlays_at): Handle extending vec uniformly.
Richard M. Stallman <rms@gnu.org>
parents: 46864
diff changeset
2818 /* 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
2819 len *= 2;
a92cb918558c (overlays_at): Handle extending vec uniformly.
Richard M. Stallman <rms@gnu.org>
parents: 46864
diff changeset
2820 if (len == 0)
a92cb918558c (overlays_at): Handle extending vec uniformly.
Richard M. Stallman <rms@gnu.org>
parents: 46864
diff changeset
2821 len = 4;
a92cb918558c (overlays_at): Handle extending vec uniformly.
Richard M. Stallman <rms@gnu.org>
parents: 46864
diff changeset
2822 *len_ptr = len;
12382
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
2823 vec = (Lisp_Object *) xrealloc (vec, len * sizeof (Lisp_Object));
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
2824 *vec_ptr = vec;
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
2825 }
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
2826 else
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
2827 inhibit_storing = 1;
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
2828 }
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
2829
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
2830 if (!inhibit_storing)
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
2831 vec[idx] = overlay;
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
2832 /* 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
2833 idx++;
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
2834 }
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
2835 else if (startpos < next)
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
2836 next = startpos;
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
2837 }
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
2838
51844
c5036e7cc93b (overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51827
diff changeset
2839 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
2840 {
110545
6ae8bab9b79a Fix int/EMACS_INT use in buffer.c.
Eli Zaretskii <eliz@gnu.org>
parents: 110361
diff changeset
2841 EMACS_INT startpos, endpos;
12382
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
2842
51844
c5036e7cc93b (overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51827
diff changeset
2843 XSETMISC (overlay, tail);
12382
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
2844
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
2845 ostart = OVERLAY_START (overlay);
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
2846 oend = OVERLAY_END (overlay);
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
2847 startpos = OVERLAY_POSITION (ostart);
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
2848 if (end < startpos)
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
2849 {
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
2850 if (startpos < next)
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
2851 next = startpos;
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
2852 break;
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
2853 }
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
2854 endpos = OVERLAY_POSITION (oend);
92975
ca18807830f1 (overlays_in, Foverlays_in): Include empty overlays
Martin Rudalics <rudalics@gmx.at>
parents: 92767
diff changeset
2855 /* Count an interval if it overlaps the range, is empty at the
ca18807830f1 (overlays_in, Foverlays_in): Include empty overlays
Martin Rudalics <rudalics@gmx.at>
parents: 92767
diff changeset
2856 start of the range, or is empty at END provided END denotes the
ca18807830f1 (overlays_in, Foverlays_in): Include empty overlays
Martin Rudalics <rudalics@gmx.at>
parents: 92767
diff changeset
2857 end of the buffer. */
12382
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
2858 if ((beg < endpos && startpos < end)
92975
ca18807830f1 (overlays_in, Foverlays_in): Include empty overlays
Martin Rudalics <rudalics@gmx.at>
parents: 92767
diff changeset
2859 || (startpos == endpos
ca18807830f1 (overlays_in, Foverlays_in): Include empty overlays
Martin Rudalics <rudalics@gmx.at>
parents: 92767
diff changeset
2860 && (beg == endpos || (end_is_Z && endpos == end))))
12382
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
2861 {
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
2862 if (idx == len)
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
2863 {
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
2864 if (extend)
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
2865 {
46920
a92cb918558c (overlays_at): Handle extending vec uniformly.
Richard M. Stallman <rms@gnu.org>
parents: 46864
diff changeset
2866 /* 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
2867 len *= 2;
a92cb918558c (overlays_at): Handle extending vec uniformly.
Richard M. Stallman <rms@gnu.org>
parents: 46864
diff changeset
2868 if (len == 0)
a92cb918558c (overlays_at): Handle extending vec uniformly.
Richard M. Stallman <rms@gnu.org>
parents: 46864
diff changeset
2869 len = 4;
a92cb918558c (overlays_at): Handle extending vec uniformly.
Richard M. Stallman <rms@gnu.org>
parents: 46864
diff changeset
2870 *len_ptr = len;
12382
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
2871 vec = (Lisp_Object *) xrealloc (vec, len * sizeof (Lisp_Object));
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
2872 *vec_ptr = vec;
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
2873 }
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
2874 else
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
2875 inhibit_storing = 1;
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
2876 }
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
2877
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
2878 if (!inhibit_storing)
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
2879 vec[idx] = overlay;
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
2880 idx++;
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
2881 }
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
2882 else if (endpos < beg && endpos > prev)
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
2883 prev = endpos;
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
2884 }
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
2885
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
2886 if (next_ptr)
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
2887 *next_ptr = next;
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
2888 if (prev_ptr)
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
2889 *prev_ptr = prev;
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
2890 return idx;
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
2891 }
36584
1f80152aeddc (mouse_face_overlay_overlaps): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 35339
diff changeset
2892
1f80152aeddc (mouse_face_overlay_overlaps): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 35339
diff changeset
2893
1f80152aeddc (mouse_face_overlay_overlaps): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 35339
diff changeset
2894 /* 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
2895 `mouse-face' property overlapping OVERLAY. */
1f80152aeddc (mouse_face_overlay_overlaps): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 35339
diff changeset
2896
1f80152aeddc (mouse_face_overlay_overlaps): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 35339
diff changeset
2897 int
109144
7dceae91724c Convert most remaining function definitions to standard C.
Juanma Barranquero <lekktu@gmail.com>
parents: 109100
diff changeset
2898 mouse_face_overlay_overlaps (Lisp_Object overlay)
36584
1f80152aeddc (mouse_face_overlay_overlaps): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 35339
diff changeset
2899 {
110545
6ae8bab9b79a Fix int/EMACS_INT use in buffer.c.
Eli Zaretskii <eliz@gnu.org>
parents: 110361
diff changeset
2900 EMACS_INT start = OVERLAY_POSITION (OVERLAY_START (overlay));
6ae8bab9b79a Fix int/EMACS_INT use in buffer.c.
Eli Zaretskii <eliz@gnu.org>
parents: 110361
diff changeset
2901 EMACS_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
2902 int n, i, size;
36584
1f80152aeddc (mouse_face_overlay_overlaps): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 35339
diff changeset
2903 Lisp_Object *v, tem;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49444
diff changeset
2904
37463
7db9a70334b7 (mouse_face_overlay_overlaps): Fix the computation
Gerd Moellmann <gerd@gnu.org>
parents: 37011
diff changeset
2905 size = 10;
7db9a70334b7 (mouse_face_overlay_overlaps): Fix the computation
Gerd Moellmann <gerd@gnu.org>
parents: 37011
diff changeset
2906 v = (Lisp_Object *) alloca (size * sizeof *v);
7db9a70334b7 (mouse_face_overlay_overlaps): Fix the computation
Gerd Moellmann <gerd@gnu.org>
parents: 37011
diff changeset
2907 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
2908 if (n > size)
36584
1f80152aeddc (mouse_face_overlay_overlaps): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 35339
diff changeset
2909 {
1f80152aeddc (mouse_face_overlay_overlaps): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 35339
diff changeset
2910 v = (Lisp_Object *) alloca (n * sizeof *v);
1f80152aeddc (mouse_face_overlay_overlaps): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 35339
diff changeset
2911 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
2912 }
1f80152aeddc (mouse_face_overlay_overlaps): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 35339
diff changeset
2913
1f80152aeddc (mouse_face_overlay_overlaps): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 35339
diff changeset
2914 for (i = 0; i < n; ++i)
1f80152aeddc (mouse_face_overlay_overlaps): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 35339
diff changeset
2915 if (!EQ (v[i], overlay)
1f80152aeddc (mouse_face_overlay_overlaps): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 35339
diff changeset
2916 && (tem = Foverlay_get (overlay, Qmouse_face),
1f80152aeddc (mouse_face_overlay_overlaps): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 35339
diff changeset
2917 !NILP (tem)))
1f80152aeddc (mouse_face_overlay_overlaps): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 35339
diff changeset
2918 break;
1f80152aeddc (mouse_face_overlay_overlaps): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 35339
diff changeset
2919
1f80152aeddc (mouse_face_overlay_overlaps): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 35339
diff changeset
2920 return i < n;
1f80152aeddc (mouse_face_overlay_overlaps): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 35339
diff changeset
2921 }
1f80152aeddc (mouse_face_overlay_overlaps): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 35339
diff changeset
2922
1f80152aeddc (mouse_face_overlay_overlaps): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 35339
diff changeset
2923
12382
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
2924
11097
e1b4b0d66bf3 (overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents: 11052
diff changeset
2925 /* 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
2926 int
110545
6ae8bab9b79a Fix int/EMACS_INT use in buffer.c.
Eli Zaretskii <eliz@gnu.org>
parents: 110361
diff changeset
2927 overlay_touches_p (EMACS_INT pos)
11097
e1b4b0d66bf3 (overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents: 11052
diff changeset
2928 {
51844
c5036e7cc93b (overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51827
diff changeset
2929 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
2930 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
2931
c5036e7cc93b (overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51827
diff changeset
2932 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
2933 {
110545
6ae8bab9b79a Fix int/EMACS_INT use in buffer.c.
Eli Zaretskii <eliz@gnu.org>
parents: 110361
diff changeset
2934 EMACS_INT endpos;
11097
e1b4b0d66bf3 (overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents: 11052
diff changeset
2935
51844
c5036e7cc93b (overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51827
diff changeset
2936 XSETMISC (overlay ,tail);
90970
3371fc48749b Replace uses of GC_* macros with the non-GC_ versions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 90918
diff changeset
2937 if (!OVERLAYP (overlay))
11097
e1b4b0d66bf3 (overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents: 11052
diff changeset
2938 abort ();
e1b4b0d66bf3 (overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents: 11052
diff changeset
2939
e1b4b0d66bf3 (overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents: 11052
diff changeset
2940 endpos = OVERLAY_POSITION (OVERLAY_END (overlay));
e1b4b0d66bf3 (overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents: 11052
diff changeset
2941 if (endpos < pos)
e1b4b0d66bf3 (overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents: 11052
diff changeset
2942 break;
e1b4b0d66bf3 (overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents: 11052
diff changeset
2943 if (endpos == pos || OVERLAY_POSITION (OVERLAY_START (overlay)) == pos)
e1b4b0d66bf3 (overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents: 11052
diff changeset
2944 return 1;
e1b4b0d66bf3 (overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents: 11052
diff changeset
2945 }
e1b4b0d66bf3 (overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents: 11052
diff changeset
2946
51844
c5036e7cc93b (overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51827
diff changeset
2947 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
2948 {
110545
6ae8bab9b79a Fix int/EMACS_INT use in buffer.c.
Eli Zaretskii <eliz@gnu.org>
parents: 110361
diff changeset
2949 EMACS_INT startpos;
11097
e1b4b0d66bf3 (overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents: 11052
diff changeset
2950
51844
c5036e7cc93b (overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51827
diff changeset
2951 XSETMISC (overlay, tail);
90970
3371fc48749b Replace uses of GC_* macros with the non-GC_ versions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 90918
diff changeset
2952 if (!OVERLAYP (overlay))
11097
e1b4b0d66bf3 (overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents: 11052
diff changeset
2953 abort ();
e1b4b0d66bf3 (overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents: 11052
diff changeset
2954
e1b4b0d66bf3 (overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents: 11052
diff changeset
2955 startpos = OVERLAY_POSITION (OVERLAY_START (overlay));
e1b4b0d66bf3 (overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents: 11052
diff changeset
2956 if (pos < startpos)
e1b4b0d66bf3 (overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents: 11052
diff changeset
2957 break;
e1b4b0d66bf3 (overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents: 11052
diff changeset
2958 if (startpos == pos || OVERLAY_POSITION (OVERLAY_END (overlay)) == pos)
e1b4b0d66bf3 (overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents: 11052
diff changeset
2959 return 1;
e1b4b0d66bf3 (overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents: 11052
diff changeset
2960 }
e1b4b0d66bf3 (overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents: 11052
diff changeset
2961 return 0;
e1b4b0d66bf3 (overlay_touches_p): New function.
Karl Heuer <kwzh@gnu.org>
parents: 11052
diff changeset
2962 }
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
2963
5857
03f8720af7fb (sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents: 5703
diff changeset
2964 struct sortvec
03f8720af7fb (sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents: 5703
diff changeset
2965 {
03f8720af7fb (sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents: 5703
diff changeset
2966 Lisp_Object overlay;
110545
6ae8bab9b79a Fix int/EMACS_INT use in buffer.c.
Eli Zaretskii <eliz@gnu.org>
parents: 110361
diff changeset
2967 EMACS_INT beg, end;
5857
03f8720af7fb (sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents: 5703
diff changeset
2968 int priority;
03f8720af7fb (sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents: 5703
diff changeset
2969 };
03f8720af7fb (sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents: 5703
diff changeset
2970
03f8720af7fb (sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents: 5703
diff changeset
2971 static int
109144
7dceae91724c Convert most remaining function definitions to standard C.
Juanma Barranquero <lekktu@gmail.com>
parents: 109100
diff changeset
2972 compare_overlays (const void *v1, const void *v2)
5857
03f8720af7fb (sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents: 5703
diff changeset
2973 {
21514
fa9ff387d260 Fix -Wimplicit warnings.
Andreas Schwab <schwab@suse.de>
parents: 21506
diff changeset
2974 const struct sortvec *s1 = (const struct sortvec *) v1;
fa9ff387d260 Fix -Wimplicit warnings.
Andreas Schwab <schwab@suse.de>
parents: 21506
diff changeset
2975 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
2976 if (s1->priority != s2->priority)
03f8720af7fb (sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents: 5703
diff changeset
2977 return s1->priority - s2->priority;
03f8720af7fb (sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents: 5703
diff changeset
2978 if (s1->beg != s2->beg)
03f8720af7fb (sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents: 5703
diff changeset
2979 return s1->beg - s2->beg;
03f8720af7fb (sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents: 5703
diff changeset
2980 if (s1->end != s2->end)
03f8720af7fb (sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents: 5703
diff changeset
2981 return s2->end - s1->end;
03f8720af7fb (sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents: 5703
diff changeset
2982 return 0;
03f8720af7fb (sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents: 5703
diff changeset
2983 }
03f8720af7fb (sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents: 5703
diff changeset
2984
03f8720af7fb (sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents: 5703
diff changeset
2985 /* 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
2986 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
2987 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
2988 int
109144
7dceae91724c Convert most remaining function definitions to standard C.
Juanma Barranquero <lekktu@gmail.com>
parents: 109100
diff changeset
2989 sort_overlays (Lisp_Object *overlay_vec, int noverlays, struct window *w)
5857
03f8720af7fb (sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents: 5703
diff changeset
2990 {
03f8720af7fb (sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents: 5703
diff changeset
2991 int i, j;
03f8720af7fb (sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents: 5703
diff changeset
2992 struct sortvec *sortvec;
03f8720af7fb (sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents: 5703
diff changeset
2993 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
2994
03f8720af7fb (sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents: 5703
diff changeset
2995 /* 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
2996
03f8720af7fb (sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents: 5703
diff changeset
2997 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
2998 {
6061
e40292d5c167 (sort_overlays): Allow for null window.
Karl Heuer <kwzh@gnu.org>
parents: 6051
diff changeset
2999 Lisp_Object tem;
6493
33a461f14903 (sort_overlays, Fmake_overlay): Use assignment, not initialization.
Karl Heuer <kwzh@gnu.org>
parents: 6477
diff changeset
3000 Lisp_Object overlay;
33a461f14903 (sort_overlays, Fmake_overlay): Use assignment, not initialization.
Karl Heuer <kwzh@gnu.org>
parents: 6477
diff changeset
3001
33a461f14903 (sort_overlays, Fmake_overlay): Use assignment, not initialization.
Karl Heuer <kwzh@gnu.org>
parents: 6477
diff changeset
3002 overlay = overlay_vec[i];
5857
03f8720af7fb (sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents: 5703
diff changeset
3003 if (OVERLAY_VALID (overlay)
03f8720af7fb (sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents: 5703
diff changeset
3004 && OVERLAY_POSITION (OVERLAY_START (overlay)) > 0
03f8720af7fb (sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents: 5703
diff changeset
3005 && OVERLAY_POSITION (OVERLAY_END (overlay)) > 0)
03f8720af7fb (sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents: 5703
diff changeset
3006 {
6061
e40292d5c167 (sort_overlays): Allow for null window.
Karl Heuer <kwzh@gnu.org>
parents: 6051
diff changeset
3007 /* 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
3008 overlays that are limited to some other window. */
e40292d5c167 (sort_overlays): Allow for null window.
Karl Heuer <kwzh@gnu.org>
parents: 6051
diff changeset
3009 if (w)
5857
03f8720af7fb (sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents: 5703
diff changeset
3010 {
6061
e40292d5c167 (sort_overlays): Allow for null window.
Karl Heuer <kwzh@gnu.org>
parents: 6051
diff changeset
3011 Lisp_Object window;
e40292d5c167 (sort_overlays): Allow for null window.
Karl Heuer <kwzh@gnu.org>
parents: 6051
diff changeset
3012
e40292d5c167 (sort_overlays): Allow for null window.
Karl Heuer <kwzh@gnu.org>
parents: 6051
diff changeset
3013 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
3014 if (WINDOWP (window) && XWINDOW (window) != w)
6061
e40292d5c167 (sort_overlays): Allow for null window.
Karl Heuer <kwzh@gnu.org>
parents: 6051
diff changeset
3015 continue;
5857
03f8720af7fb (sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents: 5703
diff changeset
3016 }
6061
e40292d5c167 (sort_overlays): Allow for null window.
Karl Heuer <kwzh@gnu.org>
parents: 6051
diff changeset
3017
e40292d5c167 (sort_overlays): Allow for null window.
Karl Heuer <kwzh@gnu.org>
parents: 6051
diff changeset
3018 /* 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
3019 sortvec[j].overlay = overlay;
e40292d5c167 (sort_overlays): Allow for null window.
Karl Heuer <kwzh@gnu.org>
parents: 6051
diff changeset
3020 sortvec[j].beg = OVERLAY_POSITION (OVERLAY_START (overlay));
e40292d5c167 (sort_overlays): Allow for null window.
Karl Heuer <kwzh@gnu.org>
parents: 6051
diff changeset
3021 sortvec[j].end = OVERLAY_POSITION (OVERLAY_END (overlay));
e40292d5c167 (sort_overlays): Allow for null window.
Karl Heuer <kwzh@gnu.org>
parents: 6051
diff changeset
3022 tem = Foverlay_get (overlay, Qpriority);
e40292d5c167 (sort_overlays): Allow for null window.
Karl Heuer <kwzh@gnu.org>
parents: 6051
diff changeset
3023 if (INTEGERP (tem))
e40292d5c167 (sort_overlays): Allow for null window.
Karl Heuer <kwzh@gnu.org>
parents: 6051
diff changeset
3024 sortvec[j].priority = XINT (tem);
e40292d5c167 (sort_overlays): Allow for null window.
Karl Heuer <kwzh@gnu.org>
parents: 6051
diff changeset
3025 else
e40292d5c167 (sort_overlays): Allow for null window.
Karl Heuer <kwzh@gnu.org>
parents: 6051
diff changeset
3026 sortvec[j].priority = 0;
e40292d5c167 (sort_overlays): Allow for null window.
Karl Heuer <kwzh@gnu.org>
parents: 6051
diff changeset
3027 j++;
5857
03f8720af7fb (sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents: 5703
diff changeset
3028 }
03f8720af7fb (sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents: 5703
diff changeset
3029 }
03f8720af7fb (sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents: 5703
diff changeset
3030 noverlays = j;
03f8720af7fb (sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents: 5703
diff changeset
3031
03f8720af7fb (sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents: 5703
diff changeset
3032 /* 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
3033
03f8720af7fb (sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents: 5703
diff changeset
3034 if (noverlays > 1)
03f8720af7fb (sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents: 5703
diff changeset
3035 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
3036
03f8720af7fb (sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents: 5703
diff changeset
3037 for (i = 0; i < noverlays; i++)
03f8720af7fb (sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents: 5703
diff changeset
3038 overlay_vec[i] = sortvec[i].overlay;
03f8720af7fb (sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents: 5703
diff changeset
3039 return (noverlays);
03f8720af7fb (sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents: 5703
diff changeset
3040 }
03f8720af7fb (sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents: 5703
diff changeset
3041
11693
efef31f1c42d (Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents: 11659
diff changeset
3042 struct sortstr
efef31f1c42d (Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents: 11659
diff changeset
3043 {
12699
d0f4113de2ea (record_overlay_string, overlay_strings): Handle zero-sized overlays better.
Karl Heuer <kwzh@gnu.org>
parents: 12697
diff changeset
3044 Lisp_Object string, string2;
11693
efef31f1c42d (Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents: 11659
diff changeset
3045 int size;
efef31f1c42d (Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents: 11659
diff changeset
3046 int priority;
efef31f1c42d (Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents: 11659
diff changeset
3047 };
efef31f1c42d (Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents: 11659
diff changeset
3048
12697
9ebf33d6d07c (struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents: 12538
diff changeset
3049 struct sortstrlist
9ebf33d6d07c (struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents: 12538
diff changeset
3050 {
9ebf33d6d07c (struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents: 12538
diff changeset
3051 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
3052 int size; /* Allocated length of that array. */
9ebf33d6d07c (struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents: 12538
diff changeset
3053 int used; /* How much of the array is currently in use. */
110545
6ae8bab9b79a Fix int/EMACS_INT use in buffer.c.
Eli Zaretskii <eliz@gnu.org>
parents: 110361
diff changeset
3054 EMACS_INT bytes; /* Total length of the strings in buf. */
12697
9ebf33d6d07c (struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents: 12538
diff changeset
3055 };
9ebf33d6d07c (struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents: 12538
diff changeset
3056
9ebf33d6d07c (struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents: 12538
diff changeset
3057 /* Buffers for storing information about the overlays touching a given
9ebf33d6d07c (struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents: 12538
diff changeset
3058 position. These could be automatic variables in overlay_strings, but
9ebf33d6d07c (struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents: 12538
diff changeset
3059 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
3060 allocating and freeing it. */
9ebf33d6d07c (struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents: 12538
diff changeset
3061 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
3062 static unsigned char *overlay_str_buf;
12697
9ebf33d6d07c (struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents: 12538
diff changeset
3063
9ebf33d6d07c (struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents: 12538
diff changeset
3064 /* Allocated length of overlay_str_buf. */
110545
6ae8bab9b79a Fix int/EMACS_INT use in buffer.c.
Eli Zaretskii <eliz@gnu.org>
parents: 110361
diff changeset
3065 static EMACS_INT overlay_str_len;
12697
9ebf33d6d07c (struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents: 12538
diff changeset
3066
11693
efef31f1c42d (Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents: 11659
diff changeset
3067 /* A comparison function suitable for passing to qsort. */
efef31f1c42d (Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents: 11659
diff changeset
3068 static int
109144
7dceae91724c Convert most remaining function definitions to standard C.
Juanma Barranquero <lekktu@gmail.com>
parents: 109100
diff changeset
3069 cmp_for_strings (const void *as1, const void *as2)
11693
efef31f1c42d (Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents: 11659
diff changeset
3070 {
efef31f1c42d (Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents: 11659
diff changeset
3071 struct sortstr *s1 = (struct sortstr *)as1;
efef31f1c42d (Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents: 11659
diff changeset
3072 struct sortstr *s2 = (struct sortstr *)as2;
efef31f1c42d (Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents: 11659
diff changeset
3073 if (s1->size != s2->size)
efef31f1c42d (Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents: 11659
diff changeset
3074 return s2->size - s1->size;
efef31f1c42d (Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents: 11659
diff changeset
3075 if (s1->priority != s2->priority)
efef31f1c42d (Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents: 11659
diff changeset
3076 return s1->priority - s2->priority;
efef31f1c42d (Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents: 11659
diff changeset
3077 return 0;
efef31f1c42d (Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents: 11659
diff changeset
3078 }
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 static void
109144
7dceae91724c Convert most remaining function definitions to standard C.
Juanma Barranquero <lekktu@gmail.com>
parents: 109100
diff changeset
3081 record_overlay_string (struct sortstrlist *ssl, Lisp_Object str, Lisp_Object str2, Lisp_Object pri, int size)
12697
9ebf33d6d07c (struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents: 12538
diff changeset
3082 {
110545
6ae8bab9b79a Fix int/EMACS_INT use in buffer.c.
Eli Zaretskii <eliz@gnu.org>
parents: 110361
diff changeset
3083 EMACS_INT nbytes;
20586
90d6a75210d6 (record_overlay_string): Totalize sizes assuming
Richard M. Stallman <rms@gnu.org>
parents: 20538
diff changeset
3084
12697
9ebf33d6d07c (struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents: 12538
diff changeset
3085 if (ssl->used == ssl->size)
9ebf33d6d07c (struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents: 12538
diff changeset
3086 {
9ebf33d6d07c (struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents: 12538
diff changeset
3087 if (ssl->buf)
9ebf33d6d07c (struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents: 12538
diff changeset
3088 ssl->size *= 2;
9ebf33d6d07c (struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents: 12538
diff changeset
3089 else
9ebf33d6d07c (struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents: 12538
diff changeset
3090 ssl->size = 5;
9ebf33d6d07c (struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents: 12538
diff changeset
3091 ssl->buf = ((struct sortstr *)
9ebf33d6d07c (struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents: 12538
diff changeset
3092 xrealloc (ssl->buf, ssl->size * sizeof (struct sortstr)));
9ebf33d6d07c (struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents: 12538
diff changeset
3093 }
9ebf33d6d07c (struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents: 12538
diff changeset
3094 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
3095 ssl->buf[ssl->used].string2 = str2;
12697
9ebf33d6d07c (struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents: 12538
diff changeset
3096 ssl->buf[ssl->used].size = size;
9ebf33d6d07c (struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents: 12538
diff changeset
3097 ssl->buf[ssl->used].priority = (INTEGERP (pri) ? XINT (pri) : 0);
9ebf33d6d07c (struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents: 12538
diff changeset
3098 ssl->used++;
20586
90d6a75210d6 (record_overlay_string): Totalize sizes assuming
Richard M. Stallman <rms@gnu.org>
parents: 20538
diff changeset
3099
90d6a75210d6 (record_overlay_string): Totalize sizes assuming
Richard M. Stallman <rms@gnu.org>
parents: 20538
diff changeset
3100 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
3101 nbytes = SCHARS (str);
20586
90d6a75210d6 (record_overlay_string): Totalize sizes assuming
Richard M. Stallman <rms@gnu.org>
parents: 20538
diff changeset
3102 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
3103 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
3104 SBYTES (str));
20586
90d6a75210d6 (record_overlay_string): Totalize sizes assuming
Richard M. Stallman <rms@gnu.org>
parents: 20538
diff changeset
3105 else
46370
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46293
diff changeset
3106 nbytes = SBYTES (str);
20586
90d6a75210d6 (record_overlay_string): Totalize sizes assuming
Richard M. Stallman <rms@gnu.org>
parents: 20538
diff changeset
3107
90d6a75210d6 (record_overlay_string): Totalize sizes assuming
Richard M. Stallman <rms@gnu.org>
parents: 20538
diff changeset
3108 ssl->bytes += nbytes;
90d6a75210d6 (record_overlay_string): Totalize sizes assuming
Richard M. Stallman <rms@gnu.org>
parents: 20538
diff changeset
3109
12699
d0f4113de2ea (record_overlay_string, overlay_strings): Handle zero-sized overlays better.
Karl Heuer <kwzh@gnu.org>
parents: 12697
diff changeset
3110 if (STRINGP (str2))
20586
90d6a75210d6 (record_overlay_string): Totalize sizes assuming
Richard M. Stallman <rms@gnu.org>
parents: 20538
diff changeset
3111 {
90d6a75210d6 (record_overlay_string): Totalize sizes assuming
Richard M. Stallman <rms@gnu.org>
parents: 20538
diff changeset
3112 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
3113 nbytes = SCHARS (str2);
20586
90d6a75210d6 (record_overlay_string): Totalize sizes assuming
Richard M. Stallman <rms@gnu.org>
parents: 20538
diff changeset
3114 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
3115 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
3116 SBYTES (str2));
20586
90d6a75210d6 (record_overlay_string): Totalize sizes assuming
Richard M. Stallman <rms@gnu.org>
parents: 20538
diff changeset
3117 else
46370
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46293
diff changeset
3118 nbytes = SBYTES (str2);
20586
90d6a75210d6 (record_overlay_string): Totalize sizes assuming
Richard M. Stallman <rms@gnu.org>
parents: 20538
diff changeset
3119
90d6a75210d6 (record_overlay_string): Totalize sizes assuming
Richard M. Stallman <rms@gnu.org>
parents: 20538
diff changeset
3120 ssl->bytes += nbytes;
90d6a75210d6 (record_overlay_string): Totalize sizes assuming
Richard M. Stallman <rms@gnu.org>
parents: 20538
diff changeset
3121 }
12697
9ebf33d6d07c (struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents: 12538
diff changeset
3122 }
11693
efef31f1c42d (Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents: 11659
diff changeset
3123
efef31f1c42d (Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents: 11659
diff changeset
3124 /* 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
3125 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
3126 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
3127 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
3128 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
3129 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
3130 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
3131
d0f4113de2ea (record_overlay_string, overlay_strings): Handle zero-sized overlays better.
Karl Heuer <kwzh@gnu.org>
parents: 12697
diff changeset
3132 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
3133 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
3134 subsequent calls. */
16243
b311d8755530 (overlay_strings): Declare pstr using unsigned char.
Richard M. Stallman <rms@gnu.org>
parents: 16213
diff changeset
3135
110554
e49fcbdc458f Fix int/EMACS_INT in eval.c and indent.c, correct previous changes.
Eli Zaretskii <eliz@gnu.org>
parents: 110545
diff changeset
3136 EMACS_INT
109144
7dceae91724c Convert most remaining function definitions to standard C.
Juanma Barranquero <lekktu@gmail.com>
parents: 109100
diff changeset
3137 overlay_strings (EMACS_INT pos, struct window *w, unsigned char **pstr)
11693
efef31f1c42d (Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents: 11659
diff changeset
3138 {
51844
c5036e7cc93b (overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51827
diff changeset
3139 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
3140 struct Lisp_Overlay *ov;
110545
6ae8bab9b79a Fix int/EMACS_INT use in buffer.c.
Eli Zaretskii <eliz@gnu.org>
parents: 110361
diff changeset
3141 EMACS_INT startpos, endpos;
20586
90d6a75210d6 (record_overlay_string): Totalize sizes assuming
Richard M. Stallman <rms@gnu.org>
parents: 20538
diff changeset
3142 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
3143
12697
9ebf33d6d07c (struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents: 12538
diff changeset
3144 overlay_heads.used = overlay_heads.bytes = 0;
9ebf33d6d07c (struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents: 12538
diff changeset
3145 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
3146 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
3147 {
51844
c5036e7cc93b (overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51827
diff changeset
3148 XSETMISC (overlay, ov);
51824
9f5665eb77bd (reset_buffer, recenter_overlay_lists)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51782
diff changeset
3149 eassert (OVERLAYP (overlay));
11693
efef31f1c42d (Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents: 11659
diff changeset
3150
efef31f1c42d (Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents: 11659
diff changeset
3151 startpos = OVERLAY_POSITION (OVERLAY_START (overlay));
efef31f1c42d (Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents: 11659
diff changeset
3152 endpos = OVERLAY_POSITION (OVERLAY_END (overlay));
efef31f1c42d (Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents: 11659
diff changeset
3153 if (endpos < pos)
efef31f1c42d (Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents: 11659
diff changeset
3154 break;
efef31f1c42d (Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents: 11659
diff changeset
3155 if (endpos != pos && startpos != pos)
efef31f1c42d (Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents: 11659
diff changeset
3156 continue;
efef31f1c42d (Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents: 11659
diff changeset
3157 window = Foverlay_get (overlay, Qwindow);
efef31f1c42d (Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents: 11659
diff changeset
3158 if (WINDOWP (window) && XWINDOW (window) != w)
efef31f1c42d (Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents: 11659
diff changeset
3159 continue;
12697
9ebf33d6d07c (struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents: 12538
diff changeset
3160 if (startpos == pos
9ebf33d6d07c (struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents: 12538
diff changeset
3161 && (str = Foverlay_get (overlay, Qbefore_string), STRINGP (str)))
9ebf33d6d07c (struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents: 12538
diff changeset
3162 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
3163 (startpos == endpos
d0f4113de2ea (record_overlay_string, overlay_strings): Handle zero-sized overlays better.
Karl Heuer <kwzh@gnu.org>
parents: 12697
diff changeset
3164 ? 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
3165 : Qnil),
d0f4113de2ea (record_overlay_string, overlay_strings): Handle zero-sized overlays better.
Karl Heuer <kwzh@gnu.org>
parents: 12697
diff changeset
3166 Foverlay_get (overlay, Qpriority),
d0f4113de2ea (record_overlay_string, overlay_strings): Handle zero-sized overlays better.
Karl Heuer <kwzh@gnu.org>
parents: 12697
diff changeset
3167 endpos - startpos);
d0f4113de2ea (record_overlay_string, overlay_strings): Handle zero-sized overlays better.
Karl Heuer <kwzh@gnu.org>
parents: 12697
diff changeset
3168 else if (endpos == pos
d0f4113de2ea (record_overlay_string, overlay_strings): Handle zero-sized overlays better.
Karl Heuer <kwzh@gnu.org>
parents: 12697
diff changeset
3169 && (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
3170 record_overlay_string (&overlay_tails, str, Qnil,
12697
9ebf33d6d07c (struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents: 12538
diff changeset
3171 Foverlay_get (overlay, Qpriority),
9ebf33d6d07c (struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents: 12538
diff changeset
3172 endpos - startpos);
11693
efef31f1c42d (Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents: 11659
diff changeset
3173 }
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 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
3175 {
51844
c5036e7cc93b (overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51827
diff changeset
3176 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
3177 eassert (OVERLAYP (overlay));
11693
efef31f1c42d (Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents: 11659
diff changeset
3178
efef31f1c42d (Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents: 11659
diff changeset
3179 startpos = OVERLAY_POSITION (OVERLAY_START (overlay));
efef31f1c42d (Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents: 11659
diff changeset
3180 endpos = OVERLAY_POSITION (OVERLAY_END (overlay));
efef31f1c42d (Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents: 11659
diff changeset
3181 if (startpos > pos)
efef31f1c42d (Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents: 11659
diff changeset
3182 break;
12697
9ebf33d6d07c (struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents: 12538
diff changeset
3183 if (endpos != pos && startpos != pos)
9ebf33d6d07c (struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents: 12538
diff changeset
3184 continue;
9ebf33d6d07c (struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents: 12538
diff changeset
3185 window = Foverlay_get (overlay, Qwindow);
9ebf33d6d07c (struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents: 12538
diff changeset
3186 if (WINDOWP (window) && XWINDOW (window) != w)
9ebf33d6d07c (struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents: 12538
diff changeset
3187 continue;
9ebf33d6d07c (struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents: 12538
diff changeset
3188 if (startpos == pos
9ebf33d6d07c (struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents: 12538
diff changeset
3189 && (str = Foverlay_get (overlay, Qbefore_string), STRINGP (str)))
9ebf33d6d07c (struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents: 12538
diff changeset
3190 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
3191 (startpos == endpos
d0f4113de2ea (record_overlay_string, overlay_strings): Handle zero-sized overlays better.
Karl Heuer <kwzh@gnu.org>
parents: 12697
diff changeset
3192 ? 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
3193 : Qnil),
d0f4113de2ea (record_overlay_string, overlay_strings): Handle zero-sized overlays better.
Karl Heuer <kwzh@gnu.org>
parents: 12697
diff changeset
3194 Foverlay_get (overlay, Qpriority),
d0f4113de2ea (record_overlay_string, overlay_strings): Handle zero-sized overlays better.
Karl Heuer <kwzh@gnu.org>
parents: 12697
diff changeset
3195 endpos - startpos);
d0f4113de2ea (record_overlay_string, overlay_strings): Handle zero-sized overlays better.
Karl Heuer <kwzh@gnu.org>
parents: 12697
diff changeset
3196 else if (endpos == pos
d0f4113de2ea (record_overlay_string, overlay_strings): Handle zero-sized overlays better.
Karl Heuer <kwzh@gnu.org>
parents: 12697
diff changeset
3197 && (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
3198 record_overlay_string (&overlay_tails, str, Qnil,
12697
9ebf33d6d07c (struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents: 12538
diff changeset
3199 Foverlay_get (overlay, Qpriority),
9ebf33d6d07c (struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents: 12538
diff changeset
3200 endpos - startpos);
11693
efef31f1c42d (Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents: 11659
diff changeset
3201 }
12697
9ebf33d6d07c (struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents: 12538
diff changeset
3202 if (overlay_tails.used > 1)
9ebf33d6d07c (struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents: 12538
diff changeset
3203 qsort (overlay_tails.buf, overlay_tails.used, sizeof (struct sortstr),
9ebf33d6d07c (struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents: 12538
diff changeset
3204 cmp_for_strings);
9ebf33d6d07c (struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents: 12538
diff changeset
3205 if (overlay_heads.used > 1)
9ebf33d6d07c (struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents: 12538
diff changeset
3206 qsort (overlay_heads.buf, overlay_heads.used, sizeof (struct sortstr),
9ebf33d6d07c (struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents: 12538
diff changeset
3207 cmp_for_strings);
9ebf33d6d07c (struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents: 12538
diff changeset
3208 if (overlay_heads.bytes || overlay_tails.bytes)
11693
efef31f1c42d (Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents: 11659
diff changeset
3209 {
12697
9ebf33d6d07c (struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents: 12538
diff changeset
3210 Lisp_Object tem;
110545
6ae8bab9b79a Fix int/EMACS_INT use in buffer.c.
Eli Zaretskii <eliz@gnu.org>
parents: 110361
diff changeset
3211 EMACS_INT i;
18603
525fb9a7cc96 (overlay_strings): Finish up previous change.
Richard M. Stallman <rms@gnu.org>
parents: 18526
diff changeset
3212 unsigned char *p;
110545
6ae8bab9b79a Fix int/EMACS_INT use in buffer.c.
Eli Zaretskii <eliz@gnu.org>
parents: 110361
diff changeset
3213 EMACS_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
3214
efef31f1c42d (Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents: 11659
diff changeset
3215 if (total > overlay_str_len)
18603
525fb9a7cc96 (overlay_strings): Finish up previous change.
Richard M. Stallman <rms@gnu.org>
parents: 18526
diff changeset
3216 {
525fb9a7cc96 (overlay_strings): Finish up previous change.
Richard M. Stallman <rms@gnu.org>
parents: 18526
diff changeset
3217 overlay_str_len = total;
525fb9a7cc96 (overlay_strings): Finish up previous change.
Richard M. Stallman <rms@gnu.org>
parents: 18526
diff changeset
3218 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
3219 total);
525fb9a7cc96 (overlay_strings): Finish up previous change.
Richard M. Stallman <rms@gnu.org>
parents: 18526
diff changeset
3220 }
12697
9ebf33d6d07c (struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents: 12538
diff changeset
3221 p = overlay_str_buf;
9ebf33d6d07c (struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents: 12538
diff changeset
3222 for (i = overlay_tails.used; --i >= 0;)
11693
efef31f1c42d (Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents: 11659
diff changeset
3223 {
110545
6ae8bab9b79a Fix int/EMACS_INT use in buffer.c.
Eli Zaretskii <eliz@gnu.org>
parents: 110361
diff changeset
3224 EMACS_INT nbytes;
12697
9ebf33d6d07c (struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents: 12538
diff changeset
3225 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
3226 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
3227 SBYTES (tem),
20586
90d6a75210d6 (record_overlay_string): Totalize sizes assuming
Richard M. Stallman <rms@gnu.org>
parents: 20538
diff changeset
3228 STRING_MULTIBYTE (tem), multibyte);
90d6a75210d6 (record_overlay_string): Totalize sizes assuming
Richard M. Stallman <rms@gnu.org>
parents: 20538
diff changeset
3229 p += nbytes;
11693
efef31f1c42d (Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents: 11659
diff changeset
3230 }
12697
9ebf33d6d07c (struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents: 12538
diff changeset
3231 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
3232 {
110545
6ae8bab9b79a Fix int/EMACS_INT use in buffer.c.
Eli Zaretskii <eliz@gnu.org>
parents: 110361
diff changeset
3233 EMACS_INT nbytes;
12697
9ebf33d6d07c (struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents: 12538
diff changeset
3234 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
3235 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
3236 SBYTES (tem),
20586
90d6a75210d6 (record_overlay_string): Totalize sizes assuming
Richard M. Stallman <rms@gnu.org>
parents: 20538
diff changeset
3237 STRING_MULTIBYTE (tem), multibyte);
90d6a75210d6 (record_overlay_string): Totalize sizes assuming
Richard M. Stallman <rms@gnu.org>
parents: 20538
diff changeset
3238 p += nbytes;
12699
d0f4113de2ea (record_overlay_string, overlay_strings): Handle zero-sized overlays better.
Karl Heuer <kwzh@gnu.org>
parents: 12697
diff changeset
3239 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
3240 if (STRINGP (tem))
d0f4113de2ea (record_overlay_string, overlay_strings): Handle zero-sized overlays better.
Karl Heuer <kwzh@gnu.org>
parents: 12697
diff changeset
3241 {
46370
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46293
diff changeset
3242 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
3243 SBYTES (tem),
20586
90d6a75210d6 (record_overlay_string): Totalize sizes assuming
Richard M. Stallman <rms@gnu.org>
parents: 20538
diff changeset
3244 STRING_MULTIBYTE (tem), multibyte);
90d6a75210d6 (record_overlay_string): Totalize sizes assuming
Richard M. Stallman <rms@gnu.org>
parents: 20538
diff changeset
3245 p += nbytes;
12699
d0f4113de2ea (record_overlay_string, overlay_strings): Handle zero-sized overlays better.
Karl Heuer <kwzh@gnu.org>
parents: 12697
diff changeset
3246 }
11693
efef31f1c42d (Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents: 11659
diff changeset
3247 }
12699
d0f4113de2ea (record_overlay_string, overlay_strings): Handle zero-sized overlays better.
Karl Heuer <kwzh@gnu.org>
parents: 12697
diff changeset
3248 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
3249 abort ();
11693
efef31f1c42d (Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents: 11659
diff changeset
3250 if (pstr)
efef31f1c42d (Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents: 11659
diff changeset
3251 *pstr = overlay_str_buf;
12697
9ebf33d6d07c (struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents: 12538
diff changeset
3252 return total;
11693
efef31f1c42d (Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents: 11659
diff changeset
3253 }
12697
9ebf33d6d07c (struct sortstrlist): New type.
Karl Heuer <kwzh@gnu.org>
parents: 12538
diff changeset
3254 return 0;
11693
efef31f1c42d (Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents: 11659
diff changeset
3255 }
efef31f1c42d (Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents: 11659
diff changeset
3256
2508
3aa2f3b35353 * buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents: 2486
diff changeset
3257 /* 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
3258
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3259 void
109144
7dceae91724c Convert most remaining function definitions to standard C.
Juanma Barranquero <lekktu@gmail.com>
parents: 109100
diff changeset
3260 recenter_overlay_lists (struct buffer *buf, EMACS_INT pos)
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3261 {
51844
c5036e7cc93b (overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51827
diff changeset
3262 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
3263 struct Lisp_Overlay *prev, *tail, *next;
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3264
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3265 /* 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
3266
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3267 /* 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
3268 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
3269 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
3270 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
3271 for (tail = buf->overlays_before; tail; prev = tail, tail = next)
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3272 {
51844
c5036e7cc93b (overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51827
diff changeset
3273 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
3274 XSETMISC (overlay, tail);
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3275
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3276 /* 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
3277 if (!OVERLAY_VALID (overlay))
2776
8bf3bb4c20dd * lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents: 2722
diff changeset
3278 #if 1
8bf3bb4c20dd * lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents: 2722
diff changeset
3279 abort ();
8bf3bb4c20dd * lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents: 2722
diff changeset
3280 #else
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3281 {
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3282 /* 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
3283 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
3284 XCDR (prev) = next;
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3285 else
2508
3aa2f3b35353 * buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents: 2486
diff changeset
3286 buf->overlays_before = next;
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3287 tail = prev;
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3288 continue;
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3289 }
2776
8bf3bb4c20dd * lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents: 2722
diff changeset
3290 #endif
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3291
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3292 beg = OVERLAY_START (overlay);
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3293 end = OVERLAY_END (overlay);
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3294
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3295 if (OVERLAY_POSITION (end) > pos)
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3296 {
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3297 /* OVERLAY needs to be moved. */
110545
6ae8bab9b79a Fix int/EMACS_INT use in buffer.c.
Eli Zaretskii <eliz@gnu.org>
parents: 110361
diff changeset
3298 EMACS_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
3299 struct Lisp_Overlay *other, *other_prev;
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3300
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3301 /* 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
3302 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
3303 prev->next = next;
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3304 else
2508
3aa2f3b35353 * buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents: 2486
diff changeset
3305 buf->overlays_before = next;
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3306
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3307 /* 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
3308 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
3309 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
3310 other_prev = other, other = other->next)
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3311 {
25744
8b89b961f7d1 (Fkill_buffer): Remove unused variables.
Gerd Moellmann <gerd@gnu.org>
parents: 25664
diff changeset
3312 Lisp_Object otherbeg, otheroverlay;
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3313
51844
c5036e7cc93b (overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51827
diff changeset
3314 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
3315 eassert (OVERLAY_VALID (otheroverlay));
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3316
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3317 otherbeg = OVERLAY_START (otheroverlay);
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3318 if (OVERLAY_POSITION (otherbeg) >= where)
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3319 break;
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3320 }
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3321
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3322 /* 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
3323 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
3324 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
3325 other_prev->next = tail;
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3326 else
2508
3aa2f3b35353 * buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents: 2486
diff changeset
3327 buf->overlays_after = tail;
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3328 tail = prev;
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3329 }
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3330 else
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3331 /* 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
3332 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
3333 so stop now. */
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3334 break;
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3335 }
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3336
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3337 /* 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
3338 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
3339 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
3340 {
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 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
3342 XSETMISC (overlay, tail);
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3343
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3344 /* 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
3345 if (!OVERLAY_VALID (overlay))
2776
8bf3bb4c20dd * lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents: 2722
diff changeset
3346 #if 1
8bf3bb4c20dd * lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents: 2722
diff changeset
3347 abort ();
8bf3bb4c20dd * lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents: 2722
diff changeset
3348 #else
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3349 {
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3350 /* 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
3351 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
3352 XCDR (prev) = next;
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3353 else
2508
3aa2f3b35353 * buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents: 2486
diff changeset
3354 buf->overlays_after = next;
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3355 tail = prev;
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3356 continue;
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3357 }
2776
8bf3bb4c20dd * lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents: 2722
diff changeset
3358 #endif
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3359
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3360 beg = OVERLAY_START (overlay);
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3361 end = OVERLAY_END (overlay);
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3362
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3363 /* Stop looking, when we know that nothing further
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3364 can possibly end before POS. */
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3365 if (OVERLAY_POSITION (beg) > pos)
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3366 break;
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3367
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3368 if (OVERLAY_POSITION (end) <= pos)
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3369 {
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3370 /* OVERLAY needs to be moved. */
110545
6ae8bab9b79a Fix int/EMACS_INT use in buffer.c.
Eli Zaretskii <eliz@gnu.org>
parents: 110361
diff changeset
3371 EMACS_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
3372 struct Lisp_Overlay *other, *other_prev;
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3373
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3374 /* 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
3375 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
3376 prev->next = next;
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3377 else
2508
3aa2f3b35353 * buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents: 2486
diff changeset
3378 buf->overlays_after = next;
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3379
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3380 /* 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
3381 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
3382 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
3383 other_prev = other, other = other->next)
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3384 {
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3385 Lisp_Object otherend, otheroverlay;
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3386
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 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
3388 eassert (OVERLAY_VALID (otheroverlay));
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3390 otherend = OVERLAY_END (otheroverlay);
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3391 if (OVERLAY_POSITION (otherend) <= where)
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3392 break;
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3393 }
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3394
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3395 /* 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
3396 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
3397 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
3398 other_prev->next = tail;
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3399 else
2508
3aa2f3b35353 * buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents: 2486
diff changeset
3400 buf->overlays_before = tail;
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3401 tail = prev;
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3402 }
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3403 }
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
3404
51824
9f5665eb77bd (reset_buffer, recenter_overlay_lists)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51782
diff changeset
3405 buf->overlay_center = pos;
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3406 }
7520
6cc6328992d6 (fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents: 7492
diff changeset
3407
11473
24ede15e0aaa (adjust_overlays_for_insert): New function.
Karl Heuer <kwzh@gnu.org>
parents: 11418
diff changeset
3408 void
109144
7dceae91724c Convert most remaining function definitions to standard C.
Juanma Barranquero <lekktu@gmail.com>
parents: 109100
diff changeset
3409 adjust_overlays_for_insert (EMACS_INT pos, EMACS_INT length)
11473
24ede15e0aaa (adjust_overlays_for_insert): New function.
Karl Heuer <kwzh@gnu.org>
parents: 11418
diff changeset
3410 {
24ede15e0aaa (adjust_overlays_for_insert): New function.
Karl Heuer <kwzh@gnu.org>
parents: 11418
diff changeset
3411 /* 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
3412 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
3413 if (current_buffer->overlay_center >= pos)
9f5665eb77bd (reset_buffer, recenter_overlay_lists)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51782
diff changeset
3414 current_buffer->overlay_center += length;
11473
24ede15e0aaa (adjust_overlays_for_insert): New function.
Karl Heuer <kwzh@gnu.org>
parents: 11418
diff changeset
3415 }
24ede15e0aaa (adjust_overlays_for_insert): New function.
Karl Heuer <kwzh@gnu.org>
parents: 11418
diff changeset
3416
24ede15e0aaa (adjust_overlays_for_insert): New function.
Karl Heuer <kwzh@gnu.org>
parents: 11418
diff changeset
3417 void
109144
7dceae91724c Convert most remaining function definitions to standard C.
Juanma Barranquero <lekktu@gmail.com>
parents: 109100
diff changeset
3418 adjust_overlays_for_delete (EMACS_INT pos, EMACS_INT length)
11473
24ede15e0aaa (adjust_overlays_for_insert): New function.
Karl Heuer <kwzh@gnu.org>
parents: 11418
diff changeset
3419 {
51824
9f5665eb77bd (reset_buffer, recenter_overlay_lists)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51782
diff changeset
3420 if (current_buffer->overlay_center < pos)
11473
24ede15e0aaa (adjust_overlays_for_insert): New function.
Karl Heuer <kwzh@gnu.org>
parents: 11418
diff changeset
3421 /* 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
3422 after-lists are still consistent. */
24ede15e0aaa (adjust_overlays_for_insert): New function.
Karl Heuer <kwzh@gnu.org>
parents: 11418
diff changeset
3423 ;
51824
9f5665eb77bd (reset_buffer, recenter_overlay_lists)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51782
diff changeset
3424 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
3425 /* 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
3426 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
3427 given the new value. */
51824
9f5665eb77bd (reset_buffer, recenter_overlay_lists)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51782
diff changeset
3428 current_buffer->overlay_center -= length;
11473
24ede15e0aaa (adjust_overlays_for_insert): New function.
Karl Heuer <kwzh@gnu.org>
parents: 11418
diff changeset
3429 else
24ede15e0aaa (adjust_overlays_for_insert): New function.
Karl Heuer <kwzh@gnu.org>
parents: 11418
diff changeset
3430 /* 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
3431 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
3432 and also update the center point. */
24ede15e0aaa (adjust_overlays_for_insert): New function.
Karl Heuer <kwzh@gnu.org>
parents: 11418
diff changeset
3433 recenter_overlay_lists (current_buffer, pos);
24ede15e0aaa (adjust_overlays_for_insert): New function.
Karl Heuer <kwzh@gnu.org>
parents: 11418
diff changeset
3434 }
24ede15e0aaa (adjust_overlays_for_insert): New function.
Karl Heuer <kwzh@gnu.org>
parents: 11418
diff changeset
3435
7520
6cc6328992d6 (fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents: 7492
diff changeset
3436 /* 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
3437 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
3438 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
3439 list and reinserted in its proper place.
6cc6328992d6 (fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents: 7492
diff changeset
3440 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
3441 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
3442 void
110545
6ae8bab9b79a Fix int/EMACS_INT use in buffer.c.
Eli Zaretskii <eliz@gnu.org>
parents: 110361
diff changeset
3443 fix_start_end_in_overlays (register EMACS_INT start, register EMACS_INT end)
7520
6cc6328992d6 (fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents: 7492
diff changeset
3444 {
25744
8b89b961f7d1 (Fkill_buffer): Remove unused variables.
Gerd Moellmann <gerd@gnu.org>
parents: 25664
diff changeset
3445 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
3446 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
3447 /* 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
3448 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
3449 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
3450 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
3451 /* '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
3452 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
3453 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
3454 struct Lisp_Overlay *tail, *parent;
110545
6ae8bab9b79a Fix int/EMACS_INT use in buffer.c.
Eli Zaretskii <eliz@gnu.org>
parents: 110361
diff changeset
3455 EMACS_INT startpos, endpos;
7520
6cc6328992d6 (fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents: 7492
diff changeset
3456
6cc6328992d6 (fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents: 7492
diff changeset
3457 /* 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
3458 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
3459 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
3460 (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
3461 (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
3462 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
3463 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
3464 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
3465 {
51844
c5036e7cc93b (overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51827
diff changeset
3466 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
3467
7520
6cc6328992d6 (fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents: 7492
diff changeset
3468 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
3469 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
3470
956112814473 (fix_start_end_in_overlays): make overlays empty if they are backwards.
Masatake YAMATO <jet@gyve.org>
parents: 54555
diff changeset
3471 /* 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
3472 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
3473 {
956112814473 (fix_start_end_in_overlays): make overlays empty if they are backwards.
Masatake YAMATO <jet@gyve.org>
parents: 54555
diff changeset
3474 startpos = endpos;
956112814473 (fix_start_end_in_overlays): make overlays empty if they are backwards.
Masatake YAMATO <jet@gyve.org>
parents: 54555
diff changeset
3475 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
3476 Qnil);
956112814473 (fix_start_end_in_overlays): make overlays empty if they are backwards.
Masatake YAMATO <jet@gyve.org>
parents: 54555
diff changeset
3477 }
956112814473 (fix_start_end_in_overlays): make overlays empty if they are backwards.
Masatake YAMATO <jet@gyve.org>
parents: 54555
diff changeset
3478
7520
6cc6328992d6 (fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents: 7492
diff changeset
3479 if (endpos < start)
6cc6328992d6 (fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents: 7492
diff changeset
3480 break;
55242
d57364949309 (syms_of_buffer) <line-spacing>: Allow float value.
Kim F. Storm <storm@cua.dk>
parents: 55140
diff changeset
3481
7520
6cc6328992d6 (fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents: 7492
diff changeset
3482 if (endpos < end
6cc6328992d6 (fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents: 7492
diff changeset
3483 || (startpos >= start && startpos < end))
6cc6328992d6 (fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents: 7492
diff changeset
3484 {
6cc6328992d6 (fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents: 7492
diff changeset
3485 /* 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
3486 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
3487 if (endpos < current_buffer->overlay_center)
7520
6cc6328992d6 (fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents: 7492
diff changeset
3488 {
51844
c5036e7cc93b (overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51827
diff changeset
3489 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
3490 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
3491 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
3492 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
3493 afterp = tail;
7520
6cc6328992d6 (fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents: 7492
diff changeset
3494 }
6cc6328992d6 (fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents: 7492
diff changeset
3495 else
6cc6328992d6 (fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents: 7492
diff changeset
3496 {
51844
c5036e7cc93b (overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51827
diff changeset
3497 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
3498 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
3499 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
3500 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
3501 beforep = tail;
7520
6cc6328992d6 (fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents: 7492
diff changeset
3502 }
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 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
3504 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
3505 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
3506 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
3507 tail = tail->next;
7520
6cc6328992d6 (fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents: 7492
diff changeset
3508 }
6cc6328992d6 (fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents: 7492
diff changeset
3509 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
3510 parent = tail, tail = parent->next;
7520
6cc6328992d6 (fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents: 7492
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 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
3513 {
51844
c5036e7cc93b (overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51827
diff changeset
3514 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
3515
7520
6cc6328992d6 (fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents: 7492
diff changeset
3516 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
3517 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
3518
956112814473 (fix_start_end_in_overlays): make overlays empty if they are backwards.
Masatake YAMATO <jet@gyve.org>
parents: 54555
diff changeset
3519 /* 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
3520 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
3521 {
956112814473 (fix_start_end_in_overlays): make overlays empty if they are backwards.
Masatake YAMATO <jet@gyve.org>
parents: 54555
diff changeset
3522 startpos = endpos;
956112814473 (fix_start_end_in_overlays): make overlays empty if they are backwards.
Masatake YAMATO <jet@gyve.org>
parents: 54555
diff changeset
3523 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
3524 Qnil);
54772
956112814473 (fix_start_end_in_overlays): make overlays empty if they are backwards.
Masatake YAMATO <jet@gyve.org>
parents: 54555
diff changeset
3525 }
956112814473 (fix_start_end_in_overlays): make overlays empty if they are backwards.
Masatake YAMATO <jet@gyve.org>
parents: 54555
diff changeset
3526
7520
6cc6328992d6 (fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents: 7492
diff changeset
3527 if (startpos >= end)
6cc6328992d6 (fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents: 7492
diff changeset
3528 break;
54772
956112814473 (fix_start_end_in_overlays): make overlays empty if they are backwards.
Masatake YAMATO <jet@gyve.org>
parents: 54555
diff changeset
3529
7520
6cc6328992d6 (fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents: 7492
diff changeset
3530 if (startpos >= start
6cc6328992d6 (fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents: 7492
diff changeset
3531 || (endpos >= start && endpos < end))
6cc6328992d6 (fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents: 7492
diff changeset
3532 {
51824
9f5665eb77bd (reset_buffer, recenter_overlay_lists)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51782
diff changeset
3533 if (endpos < current_buffer->overlay_center)
7520
6cc6328992d6 (fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents: 7492
diff changeset
3534 {
51844
c5036e7cc93b (overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51827
diff changeset
3535 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
3536 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
3537 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
3538 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
3539 afterp = tail;
7520
6cc6328992d6 (fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents: 7492
diff changeset
3540 }
6cc6328992d6 (fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents: 7492
diff changeset
3541 else
6cc6328992d6 (fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents: 7492
diff changeset
3542 {
51844
c5036e7cc93b (overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51827
diff changeset
3543 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
3544 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
3545 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
3546 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
3547 beforep = tail;
7520
6cc6328992d6 (fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents: 7492
diff changeset
3548 }
51844
c5036e7cc93b (overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51827
diff changeset
3549 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
3550 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
3551 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
3552 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
3553 tail = tail->next;
7520
6cc6328992d6 (fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents: 7492
diff changeset
3554 }
6cc6328992d6 (fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents: 7492
diff changeset
3555 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
3556 parent = tail, tail = parent->next;
7520
6cc6328992d6 (fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents: 7492
diff changeset
3557 }
6cc6328992d6 (fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents: 7492
diff changeset
3558
6cc6328992d6 (fix_overlays_in_range): New function.
Karl Heuer <kwzh@gnu.org>
parents: 7492
diff changeset
3559 /* 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
3560 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
3561 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
3562 {
51844
c5036e7cc93b (overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51827
diff changeset
3563 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
3564 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
3565 }
51824
9f5665eb77bd (reset_buffer, recenter_overlay_lists)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51782
diff changeset
3566 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
3567
51844
c5036e7cc93b (overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51827
diff changeset
3568 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
3569 {
51844
c5036e7cc93b (overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51827
diff changeset
3570 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
3571 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
3572 }
51824
9f5665eb77bd (reset_buffer, recenter_overlay_lists)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51782
diff changeset
3573 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
3574 }
17022
907fb167f7de Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16840
diff changeset
3575
907fb167f7de Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16840
diff changeset
3576 /* 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
3577 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
3578 ending marker is before-insertion-marker. When `overlays_before'
907fb167f7de Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16840
diff changeset
3579 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
3580 order and both overlays end at inserting position, inserting a text
907fb167f7de Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16840
diff changeset
3581 increases only the ending marker of the latter type, which results
907fb167f7de Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16840
diff changeset
3582 in incorrect ordering of `overlays_before'.
907fb167f7de Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16840
diff changeset
3583
907fb167f7de Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16840
diff changeset
3584 This function fixes ordering of overlays in the slot
907fb167f7de Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16840
diff changeset
3585 `overlays_before' of the buffer *BP. Before the insertion, `point'
907fb167f7de Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16840
diff changeset
3586 was at PREV, and now is at POS. */
907fb167f7de Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16840
diff changeset
3587
20368
9f5fab56f4b3 (nsberror, record_buffer, validate_region,
Kenichi Handa <handa@m17n.org>
parents: 20186
diff changeset
3588 void
109144
7dceae91724c Convert most remaining function definitions to standard C.
Juanma Barranquero <lekktu@gmail.com>
parents: 109100
diff changeset
3589 fix_overlays_before (struct buffer *bp, EMACS_INT prev, EMACS_INT pos)
17022
907fb167f7de Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16840
diff changeset
3590 {
51844
c5036e7cc93b (overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51827
diff changeset
3591 /* 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
3592 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
3593 Lisp_Object tem;
51824
9f5665eb77bd (reset_buffer, recenter_overlay_lists)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51782
diff changeset
3594 EMACS_INT end;
17022
907fb167f7de Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16840
diff changeset
3595
907fb167f7de Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16840
diff changeset
3596 /* After the insertion, the several overlays may be in incorrect
907fb167f7de Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16840
diff changeset
3597 order. The possibility is that, in the list `overlays_before',
907fb167f7de Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16840
diff changeset
3598 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
3599 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
3600 ordering of these overlays, by moving overlays ends at POS before
907fb167f7de Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16840
diff changeset
3601 the overlays ends at PREV. */
907fb167f7de Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16840
diff changeset
3602
907fb167f7de Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16840
diff changeset
3603 /* At first, find a place where disordered overlays should be linked
907fb167f7de Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16840
diff changeset
3604 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
3605 overlay whose ending marker is after-insertion-marker if disorder
907fb167f7de Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16840
diff changeset
3606 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
3607 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
3608 && (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
3609 (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
3610 {
030fb28e7ec2 * buffer.c (fix_overlays_in_range, fix_overlays_before): Don't take the address
Ken Raeburn <raeburn@raeburn.org>
parents: 44790
diff changeset
3611 parent = tail;
51844
c5036e7cc93b (overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51827
diff changeset
3612 tail = tail->next;
45374
030fb28e7ec2 * buffer.c (fix_overlays_in_range, fix_overlays_before): Don't take the address
Ken Raeburn <raeburn@raeburn.org>
parents: 44790
diff changeset
3613 }
17022
907fb167f7de Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16840
diff changeset
3614
907fb167f7de Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16840
diff changeset
3615 /* If we don't find such an overlay,
907fb167f7de Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16840
diff changeset
3616 or the found one ends before PREV,
907fb167f7de Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16840
diff changeset
3617 or the found one is the last one in the list,
907fb167f7de Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16840
diff changeset
3618 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
3619 if (!tail || end < prev || !tail->next)
17022
907fb167f7de Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16840
diff changeset
3620 return;
907fb167f7de Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16840
diff changeset
3621
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
3622 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
3623 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
3624 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
3625
030fb28e7ec2 * buffer.c (fix_overlays_in_range, fix_overlays_before): Don't take the address
Ken Raeburn <raeburn@raeburn.org>
parents: 44790
diff changeset
3626 /* 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
3627 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
3628 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
3629 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
3630 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
3631 while (tail)
17022
907fb167f7de Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16840
diff changeset
3632 {
51844
c5036e7cc93b (overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51827
diff changeset
3633 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
3634 end = OVERLAY_POSITION (OVERLAY_END (tem));
17022
907fb167f7de Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16840
diff changeset
3635
907fb167f7de Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16840
diff changeset
3636 if (end == pos)
907fb167f7de Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16840
diff changeset
3637 { /* 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
3638 struct Lisp_Overlay *found = tail;
17022
907fb167f7de Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16840
diff changeset
3639
907fb167f7de Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16840
diff changeset
3640 /* 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
3641 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
3642 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
3643 /* 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
3644 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
3645 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
3646 {
51844
c5036e7cc93b (overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51827
diff changeset
3647 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
3648 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
3649 }
030fb28e7ec2 * buffer.c (fix_overlays_in_range, fix_overlays_before): Don't take the address
Ken Raeburn <raeburn@raeburn.org>
parents: 44790
diff changeset
3650 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
3651 {
51844
c5036e7cc93b (overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51827
diff changeset
3652 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
3653 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
3654 }
17022
907fb167f7de Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16840
diff changeset
3655 }
907fb167f7de Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16840
diff changeset
3656 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
3657 {
030fb28e7ec2 * buffer.c (fix_overlays_in_range, fix_overlays_before): Don't take the address
Ken Raeburn <raeburn@raeburn.org>
parents: 44790
diff changeset
3658 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
3659 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
3660 }
17022
907fb167f7de Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16840
diff changeset
3661 else /* No more disordered overlay. */
907fb167f7de Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16840
diff changeset
3662 break;
907fb167f7de Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16840
diff changeset
3663 }
907fb167f7de Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16840
diff changeset
3664 }
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3665
2776
8bf3bb4c20dd * lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents: 2722
diff changeset
3666 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
3667 doc: /* Return t if OBJECT is an overlay. */)
109179
8cfee7d2955f Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109165
diff changeset
3668 (Lisp_Object object)
2776
8bf3bb4c20dd * lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents: 2722
diff changeset
3669 {
8bf3bb4c20dd * lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents: 2722
diff changeset
3670 return (OVERLAYP (object) ? Qt : Qnil);
8bf3bb4c20dd * lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents: 2722
diff changeset
3671 }
8bf3bb4c20dd * lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents: 2722
diff changeset
3672
13446
005d7ed9d69b (Fmake_overlay): New args front-advance and rear-advance.
Richard M. Stallman <rms@gnu.org>
parents: 13270
diff changeset
3673 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
3674 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
3675 If omitted, BUFFER defaults to the current buffer.
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
3676 BEG and END may be integers or markers.
64412
a1807609d4c2 (Fmake_overlay): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 64084
diff changeset
3677 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
3678 for the front of the overlay advance when text is inserted there
70816
8168db834af2 (syms_of_buffer, Fmake_overlay): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 70697
diff changeset
3679 \(which means the text *is not* included in the overlay).
64412
a1807609d4c2 (Fmake_overlay): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 64084
diff changeset
3680 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
3681 for the rear of the overlay advance when text is inserted there
70816
8168db834af2 (syms_of_buffer, Fmake_overlay): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 70697
diff changeset
3682 \(which means the text *is* included in the overlay). */)
109179
8cfee7d2955f Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109165
diff changeset
3683 (Lisp_Object beg, Lisp_Object end, Lisp_Object buffer, Lisp_Object front_advance, Lisp_Object rear_advance)
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3684 {
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3685 Lisp_Object overlay;
2508
3aa2f3b35353 * buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents: 2486
diff changeset
3686 struct buffer *b;
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3687
2508
3aa2f3b35353 * buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents: 2486
diff changeset
3688 if (NILP (buffer))
9262
582534b6e763 (Fget_buffer_create, Frename_buffer, Fbuffer_disable_undo,
Karl Heuer <kwzh@gnu.org>
parents: 9211
diff changeset
3689 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
3690 else
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40605
diff changeset
3691 CHECK_BUFFER (buffer);
3031
5c96dfc52433 * buffer.c (Fmake_overlay): Put beg and end in the
Jim Blandy <jimb@redhat.com>
parents: 2961
diff changeset
3692 if (MARKERP (beg)
5c96dfc52433 * buffer.c (Fmake_overlay): Put beg and end in the
Jim Blandy <jimb@redhat.com>
parents: 2961
diff changeset
3693 && ! 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
3694 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
3695 if (MARKERP (end)
5c96dfc52433 * buffer.c (Fmake_overlay): Put beg and end in the
Jim Blandy <jimb@redhat.com>
parents: 2961
diff changeset
3696 && ! 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
3697 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
3698
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40605
diff changeset
3699 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
3700 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
3701
5c96dfc52433 * buffer.c (Fmake_overlay): Put beg and end in the
Jim Blandy <jimb@redhat.com>
parents: 2961
diff changeset
3702 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
3703 {
6493
33a461f14903 (sort_overlays, Fmake_overlay): Use assignment, not initialization.
Karl Heuer <kwzh@gnu.org>
parents: 6477
diff changeset
3704 Lisp_Object temp;
33a461f14903 (sort_overlays, Fmake_overlay): Use assignment, not initialization.
Karl Heuer <kwzh@gnu.org>
parents: 6477
diff changeset
3705 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
3706 }
2508
3aa2f3b35353 * buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents: 2486
diff changeset
3707
3aa2f3b35353 * buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents: 2486
diff changeset
3708 b = XBUFFER (buffer);
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3709
3031
5c96dfc52433 * buffer.c (Fmake_overlay): Put beg and end in the
Jim Blandy <jimb@redhat.com>
parents: 2961
diff changeset
3710 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
3711 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
3712
13446
005d7ed9d69b (Fmake_overlay): New args front-advance and rear-advance.
Richard M. Stallman <rms@gnu.org>
parents: 13270
diff changeset
3713 if (!NILP (front_advance))
005d7ed9d69b (Fmake_overlay): New args front-advance and rear-advance.
Richard M. Stallman <rms@gnu.org>
parents: 13270
diff changeset
3714 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
3715 if (!NILP (rear_advance))
005d7ed9d69b (Fmake_overlay): New args front-advance and rear-advance.
Richard M. Stallman <rms@gnu.org>
parents: 13270
diff changeset
3716 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
3717
9922
f653d8aac66a (Fmake_overlay, Foverlay_properties, Foverlay_get, Foverlay_put): Use new
Karl Heuer <kwzh@gnu.org>
parents: 9920
diff changeset
3718 overlay = allocate_misc ();
11244
f3b11dc9014e (Fmake_overlay): Use XMISCTYPE.
Richard M. Stallman <rms@gnu.org>
parents: 11214
diff changeset
3719 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
3720 XOVERLAY (overlay)->start = beg;
f653d8aac66a (Fmake_overlay, Foverlay_properties, Foverlay_get, Foverlay_put): Use new
Karl Heuer <kwzh@gnu.org>
parents: 9920
diff changeset
3721 XOVERLAY (overlay)->end = end;
f653d8aac66a (Fmake_overlay, Foverlay_properties, Foverlay_get, Foverlay_put): Use new
Karl Heuer <kwzh@gnu.org>
parents: 9920
diff changeset
3722 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
3723 XOVERLAY (overlay)->next = NULL;
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3724
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49444
diff changeset
3725 /* 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
3726 end = OVERLAY_END (overlay);
51824
9f5665eb77bd (reset_buffer, recenter_overlay_lists)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51782
diff changeset
3727 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
3728 {
c5036e7cc93b (overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51827
diff changeset
3729 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
3730 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
3731 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
3732 }
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3733 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
3734 {
c5036e7cc93b (overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51827
diff changeset
3735 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
3736 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
3737 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
3738 }
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3739
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3740 /* 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
3741 recenter_overlay_lists (b, b->overlay_center);
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3742
2722
16db9d1af886 Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents: 2645
diff changeset
3743 /* 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
3744 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
3745
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3746 return overlay;
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3747 }
16193
6ff2ef91c618 (modify_overlay): Renamed from redisplay_region
Richard M. Stallman <rms@gnu.org>
parents: 16144
diff changeset
3748
6ff2ef91c618 (modify_overlay): Renamed from redisplay_region
Richard M. Stallman <rms@gnu.org>
parents: 16144
diff changeset
3749 /* 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
3750
6ff2ef91c618 (modify_overlay): Renamed from redisplay_region
Richard M. Stallman <rms@gnu.org>
parents: 16144
diff changeset
3751 static void
109144
7dceae91724c Convert most remaining function definitions to standard C.
Juanma Barranquero <lekktu@gmail.com>
parents: 109100
diff changeset
3752 modify_overlay (struct buffer *buf, EMACS_INT start, EMACS_INT end)
16193
6ff2ef91c618 (modify_overlay): Renamed from redisplay_region
Richard M. Stallman <rms@gnu.org>
parents: 16144
diff changeset
3753 {
6ff2ef91c618 (modify_overlay): Renamed from redisplay_region
Richard M. Stallman <rms@gnu.org>
parents: 16144
diff changeset
3754 if (start > end)
6ff2ef91c618 (modify_overlay): Renamed from redisplay_region
Richard M. Stallman <rms@gnu.org>
parents: 16144
diff changeset
3755 {
110545
6ae8bab9b79a Fix int/EMACS_INT use in buffer.c.
Eli Zaretskii <eliz@gnu.org>
parents: 110361
diff changeset
3756 EMACS_INT temp = start;
39333
7af35736264f (modify_overlay): Don't do nothing if START == END;
Gerd Moellmann <gerd@gnu.org>
parents: 39087
diff changeset
3757 start = end;
7af35736264f (modify_overlay): Don't do nothing if START == END;
Gerd Moellmann <gerd@gnu.org>
parents: 39087
diff changeset
3758 end = temp;
16193
6ff2ef91c618 (modify_overlay): Renamed from redisplay_region
Richard M. Stallman <rms@gnu.org>
parents: 16144
diff changeset
3759 }
6ff2ef91c618 (modify_overlay): Renamed from redisplay_region
Richard M. Stallman <rms@gnu.org>
parents: 16144
diff changeset
3760
27012
520f982f3a9a (modify_overlay): Always compute unchanged info.
Gerd Moellmann <gerd@gnu.org>
parents: 26970
diff changeset
3761 BUF_COMPUTE_UNCHANGED (buf, start, end);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49444
diff changeset
3762
16193
6ff2ef91c618 (modify_overlay): Renamed from redisplay_region
Richard M. Stallman <rms@gnu.org>
parents: 16144
diff changeset
3763 /* 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
3764 we must do other windows. */
6ff2ef91c618 (modify_overlay): Renamed from redisplay_region
Richard M. Stallman <rms@gnu.org>
parents: 16144
diff changeset
3765 if (buf != XBUFFER (XWINDOW (selected_window)->buffer))
6ff2ef91c618 (modify_overlay): Renamed from redisplay_region
Richard M. Stallman <rms@gnu.org>
parents: 16144
diff changeset
3766 windows_or_buffers_changed = 1;
6ff2ef91c618 (modify_overlay): Renamed from redisplay_region
Richard M. Stallman <rms@gnu.org>
parents: 16144
diff changeset
3767 /* 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
3768 else if (buffer_shared > 1)
6ff2ef91c618 (modify_overlay): Renamed from redisplay_region
Richard M. Stallman <rms@gnu.org>
parents: 16144
diff changeset
3769 windows_or_buffers_changed = 1;
69144
5c9e3eb42568 (modify_overlay): Force redisplay if we modify an
Kim F. Storm <storm@cua.dk>
parents: 69047
diff changeset
3770 /* If we modify an overlay at the end of the buffer, we cannot
5c9e3eb42568 (modify_overlay): Force redisplay if we modify an
Kim F. Storm <storm@cua.dk>
parents: 69047
diff changeset
3771 be sure that window end is still valid. */
5c9e3eb42568 (modify_overlay): Force redisplay if we modify an
Kim F. Storm <storm@cua.dk>
parents: 69047
diff changeset
3772 else if (end >= ZV && start <= ZV)
5c9e3eb42568 (modify_overlay): Force redisplay if we modify an
Kim F. Storm <storm@cua.dk>
parents: 69047
diff changeset
3773 windows_or_buffers_changed = 1;
16193
6ff2ef91c618 (modify_overlay): Renamed from redisplay_region
Richard M. Stallman <rms@gnu.org>
parents: 16144
diff changeset
3774
19801
7482ad23e430 (modify_overlay): Update overlay_modiff of proper buffer.
Richard M. Stallman <rms@gnu.org>
parents: 19581
diff changeset
3775 ++BUF_OVERLAY_MODIFF (buf);
16193
6ff2ef91c618 (modify_overlay): Renamed from redisplay_region
Richard M. Stallman <rms@gnu.org>
parents: 16144
diff changeset
3776 }
6ff2ef91c618 (modify_overlay): Renamed from redisplay_region
Richard M. Stallman <rms@gnu.org>
parents: 16144
diff changeset
3777
39971
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
3778
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 static struct Lisp_Overlay *
109144
7dceae91724c Convert most remaining function definitions to standard C.
Juanma Barranquero <lekktu@gmail.com>
parents: 109100
diff changeset
3780 unchain_overlay (struct Lisp_Overlay *list, struct Lisp_Overlay *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
3781 {
c5036e7cc93b (overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51827
diff changeset
3782 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
3783 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
3784 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
3785 {
c5036e7cc93b (overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51827
diff changeset
3786 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
3787 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
3788 else
c5036e7cc93b (overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51827
diff changeset
3789 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
3790 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
3791 break;
c5036e7cc93b (overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51827
diff changeset
3792 }
c5036e7cc93b (overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51827
diff changeset
3793 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
3794 }
c5036e7cc93b (overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51827
diff changeset
3795
2508
3aa2f3b35353 * buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents: 2486
diff changeset
3796 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
3797 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
3798 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
3799 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
3800 buffer. */)
109179
8cfee7d2955f Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109165
diff changeset
3801 (Lisp_Object overlay, Lisp_Object beg, Lisp_Object end, Lisp_Object buffer)
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3802 {
3533
78b4e6241f85 (Fdelete_overlay): Do nothing if overlay already deleted.
Richard M. Stallman <rms@gnu.org>
parents: 3481
diff changeset
3803 struct buffer *b, *ob;
78b4e6241f85 (Fdelete_overlay): Do nothing if overlay already deleted.
Richard M. Stallman <rms@gnu.org>
parents: 3481
diff changeset
3804 Lisp_Object obuffer;
46293
1fb8f75062c6 Use macro SPECPDL_INDEX.
Juanma Barranquero <lekktu@gmail.com>
parents: 46199
diff changeset
3805 int count = SPECPDL_INDEX ();
2508
3aa2f3b35353 * buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents: 2486
diff changeset
3806
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40605
diff changeset
3807 CHECK_OVERLAY (overlay);
2508
3aa2f3b35353 * buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents: 2486
diff changeset
3808 if (NILP (buffer))
3aa2f3b35353 * buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents: 2486
diff changeset
3809 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
3810 if (NILP (buffer))
9262
582534b6e763 (Fget_buffer_create, Frename_buffer, Fbuffer_disable_undo,
Karl Heuer <kwzh@gnu.org>
parents: 9211
diff changeset
3811 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
3812 CHECK_BUFFER (buffer);
3031
5c96dfc52433 * buffer.c (Fmake_overlay): Put beg and end in the
Jim Blandy <jimb@redhat.com>
parents: 2961
diff changeset
3813
5c96dfc52433 * buffer.c (Fmake_overlay): Put beg and end in the
Jim Blandy <jimb@redhat.com>
parents: 2961
diff changeset
3814 if (MARKERP (beg)
5c96dfc52433 * buffer.c (Fmake_overlay): Put beg and end in the
Jim Blandy <jimb@redhat.com>
parents: 2961
diff changeset
3815 && ! 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
3816 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
3817 if (MARKERP (end)
5c96dfc52433 * buffer.c (Fmake_overlay): Put beg and end in the
Jim Blandy <jimb@redhat.com>
parents: 2961
diff changeset
3818 && ! 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
3819 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
3820
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40605
diff changeset
3821 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
3822 CHECK_NUMBER_COERCE_MARKER (end);
2722
16db9d1af886 Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents: 2645
diff changeset
3823
8839
41981db9ad8e (Qevaporate): New symbol.
Karl Heuer <kwzh@gnu.org>
parents: 8818
diff changeset
3824 if (XINT (beg) == XINT (end) && ! NILP (Foverlay_get (overlay, Qevaporate)))
41981db9ad8e (Qevaporate): New symbol.
Karl Heuer <kwzh@gnu.org>
parents: 8818
diff changeset
3825 return Fdelete_overlay (overlay);
3533
78b4e6241f85 (Fdelete_overlay): Do nothing if overlay already deleted.
Richard M. Stallman <rms@gnu.org>
parents: 3481
diff changeset
3826
2722
16db9d1af886 Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents: 2645
diff changeset
3827 if (XINT (beg) > XINT (end))
16db9d1af886 Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents: 2645
diff changeset
3828 {
6493
33a461f14903 (sort_overlays, Fmake_overlay): Use assignment, not initialization.
Karl Heuer <kwzh@gnu.org>
parents: 6477
diff changeset
3829 Lisp_Object temp;
33a461f14903 (sort_overlays, Fmake_overlay): Use assignment, not initialization.
Karl Heuer <kwzh@gnu.org>
parents: 6477
diff changeset
3830 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
3831 }
16db9d1af886 Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents: 2645
diff changeset
3832
8839
41981db9ad8e (Qevaporate): New symbol.
Karl Heuer <kwzh@gnu.org>
parents: 8818
diff changeset
3833 specbind (Qinhibit_quit, Qt);
41981db9ad8e (Qevaporate): New symbol.
Karl Heuer <kwzh@gnu.org>
parents: 8818
diff changeset
3834
3533
78b4e6241f85 (Fdelete_overlay): Do nothing if overlay already deleted.
Richard M. Stallman <rms@gnu.org>
parents: 3481
diff changeset
3835 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
3836 b = XBUFFER (buffer);
28417
4b675266db04 * lisp.h (XCONS, XSTRING, XSYMBOL, XFLOAT, XPROCESS, XWINDOW, XSUBR, XBUFFER):
Ken Raeburn <raeburn@raeburn.org>
parents: 28352
diff changeset
3837 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
3838
3204
a3007f83650c * buffer.c (Fmove_overlay): If the overlay is changing buffers,
Jim Blandy <jimb@redhat.com>
parents: 3031
diff changeset
3839 /* 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
3840 if (!EQ (buffer, obuffer))
7985
f6c309d5d314 (Fmove_overlay): Call redisplay_region even when
Richard M. Stallman <rms@gnu.org>
parents: 7670
diff changeset
3841 {
f6c309d5d314 (Fmove_overlay): Call redisplay_region even when
Richard M. Stallman <rms@gnu.org>
parents: 7670
diff changeset
3842 /* Redisplay where the overlay was. */
f6c309d5d314 (Fmove_overlay): Call redisplay_region even when
Richard M. Stallman <rms@gnu.org>
parents: 7670
diff changeset
3843 if (!NILP (obuffer))
f6c309d5d314 (Fmove_overlay): Call redisplay_region even when
Richard M. Stallman <rms@gnu.org>
parents: 7670
diff changeset
3844 {
110545
6ae8bab9b79a Fix int/EMACS_INT use in buffer.c.
Eli Zaretskii <eliz@gnu.org>
parents: 110361
diff changeset
3845 EMACS_INT o_beg;
6ae8bab9b79a Fix int/EMACS_INT use in buffer.c.
Eli Zaretskii <eliz@gnu.org>
parents: 110361
diff changeset
3846 EMACS_INT o_end;
7985
f6c309d5d314 (Fmove_overlay): Call redisplay_region even when
Richard M. Stallman <rms@gnu.org>
parents: 7670
diff changeset
3847
18105
bc690c1e1950 (Fmove_overlay): Clean up setting o_beg and o_end.
Richard M. Stallman <rms@gnu.org>
parents: 18009
diff changeset
3848 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
3849 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
3850
18613
614b916ff5bf Fix bugs with inappropriate mixing of Lisp_Object with int.
Richard M. Stallman <rms@gnu.org>
parents: 18603
diff changeset
3851 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
3852 }
f6c309d5d314 (Fmove_overlay): Call redisplay_region even when
Richard M. Stallman <rms@gnu.org>
parents: 7670
diff changeset
3853
f6c309d5d314 (Fmove_overlay): Call redisplay_region even when
Richard M. Stallman <rms@gnu.org>
parents: 7670
diff changeset
3854 /* 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
3855 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
3856 }
3204
a3007f83650c * buffer.c (Fmove_overlay): If the overlay is changing buffers,
Jim Blandy <jimb@redhat.com>
parents: 3031
diff changeset
3857 else
a3007f83650c * buffer.c (Fmove_overlay): If the overlay is changing buffers,
Jim Blandy <jimb@redhat.com>
parents: 3031
diff changeset
3858 /* 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
3859 {
110545
6ae8bab9b79a Fix int/EMACS_INT use in buffer.c.
Eli Zaretskii <eliz@gnu.org>
parents: 110361
diff changeset
3860 EMACS_INT o_beg, o_end;
2722
16db9d1af886 Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents: 2645
diff changeset
3861
18105
bc690c1e1950 (Fmove_overlay): Clean up setting o_beg and o_end.
Richard M. Stallman <rms@gnu.org>
parents: 18009
diff changeset
3862 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
3863 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
3864
18613
614b916ff5bf Fix bugs with inappropriate mixing of Lisp_Object with int.
Richard M. Stallman <rms@gnu.org>
parents: 18603
diff changeset
3865 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
3866 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
3867 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
3868 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
3869 else
a3007f83650c * buffer.c (Fmove_overlay): If the overlay is changing buffers,
Jim Blandy <jimb@redhat.com>
parents: 3031
diff changeset
3870 {
18613
614b916ff5bf Fix bugs with inappropriate mixing of Lisp_Object with int.
Richard M. Stallman <rms@gnu.org>
parents: 18603
diff changeset
3871 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
3872 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
3873 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
3874 }
a3007f83650c * buffer.c (Fmove_overlay): If the overlay is changing buffers,
Jim Blandy <jimb@redhat.com>
parents: 3031
diff changeset
3875 }
2722
16db9d1af886 Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents: 2645
diff changeset
3876
3533
78b4e6241f85 (Fdelete_overlay): Do nothing if overlay already deleted.
Richard M. Stallman <rms@gnu.org>
parents: 3481
diff changeset
3877 if (!NILP (obuffer))
78b4e6241f85 (Fdelete_overlay): Do nothing if overlay already deleted.
Richard M. Stallman <rms@gnu.org>
parents: 3481
diff changeset
3878 {
51844
c5036e7cc93b (overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51827
diff changeset
3879 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
3880 = 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
3881 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
3882 = 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
3883 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
3884 }
2508
3aa2f3b35353 * buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents: 2486
diff changeset
3885
3aa2f3b35353 * buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents: 2486
diff changeset
3886 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
3887 Fset_marker (OVERLAY_END (overlay), end, buffer);
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3888
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49444
diff changeset
3889 /* Put the overlay on the wrong list. */
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3890 end = OVERLAY_END (overlay);
51824
9f5665eb77bd (reset_buffer, recenter_overlay_lists)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51782
diff changeset
3891 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
3892 {
52253
79185e10e92f (Fmove_overlay): Set overlay's next pointer
Gerd Moellmann <gerd@gnu.org>
parents: 52012
diff changeset
3893 XOVERLAY (overlay)->next = b->overlays_after;
79185e10e92f (Fmove_overlay): Set overlay's next pointer
Gerd Moellmann <gerd@gnu.org>
parents: 52012
diff changeset
3894 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
3895 }
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3896 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
3897 {
52253
79185e10e92f (Fmove_overlay): Set overlay's next pointer
Gerd Moellmann <gerd@gnu.org>
parents: 52012
diff changeset
3898 XOVERLAY (overlay)->next = b->overlays_before;
79185e10e92f (Fmove_overlay): Set overlay's next pointer
Gerd Moellmann <gerd@gnu.org>
parents: 52012
diff changeset
3899 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
3900 }
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3901
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3902 /* 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
3903 recenter_overlay_lists (b, b->overlay_center);
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3904
3533
78b4e6241f85 (Fdelete_overlay): Do nothing if overlay already deleted.
Richard M. Stallman <rms@gnu.org>
parents: 3481
diff changeset
3905 return unbind_to (count, overlay);
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3906 }
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3907
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3908 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
3909 doc: /* Delete the overlay OVERLAY from its buffer. */)
109179
8cfee7d2955f Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109165
diff changeset
3910 (Lisp_Object overlay)
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3911 {
3533
78b4e6241f85 (Fdelete_overlay): Do nothing if overlay already deleted.
Richard M. Stallman <rms@gnu.org>
parents: 3481
diff changeset
3912 Lisp_Object buffer;
2508
3aa2f3b35353 * buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents: 2486
diff changeset
3913 struct buffer *b;
46293
1fb8f75062c6 Use macro SPECPDL_INDEX.
Juanma Barranquero <lekktu@gmail.com>
parents: 46199
diff changeset
3914 int count = SPECPDL_INDEX ();
2508
3aa2f3b35353 * buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents: 2486
diff changeset
3915
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40605
diff changeset
3916 CHECK_OVERLAY (overlay);
2776
8bf3bb4c20dd * lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents: 2722
diff changeset
3917
3533
78b4e6241f85 (Fdelete_overlay): Do nothing if overlay already deleted.
Richard M. Stallman <rms@gnu.org>
parents: 3481
diff changeset
3918 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
3919 if (NILP (buffer))
78b4e6241f85 (Fdelete_overlay): Do nothing if overlay already deleted.
Richard M. Stallman <rms@gnu.org>
parents: 3481
diff changeset
3920 return Qnil;
78b4e6241f85 (Fdelete_overlay): Do nothing if overlay already deleted.
Richard M. Stallman <rms@gnu.org>
parents: 3481
diff changeset
3921
78b4e6241f85 (Fdelete_overlay): Do nothing if overlay already deleted.
Richard M. Stallman <rms@gnu.org>
parents: 3481
diff changeset
3922 b = XBUFFER (buffer);
78b4e6241f85 (Fdelete_overlay): Do nothing if overlay already deleted.
Richard M. Stallman <rms@gnu.org>
parents: 3481
diff changeset
3923 specbind (Qinhibit_quit, Qt);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49444
diff changeset
3924
51844
c5036e7cc93b (overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51827
diff changeset
3925 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
3926 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
3927 eassert (XOVERLAY (overlay)->next == NULL);
16193
6ff2ef91c618 (modify_overlay): Renamed from redisplay_region
Richard M. Stallman <rms@gnu.org>
parents: 16144
diff changeset
3928 modify_overlay (b,
21898
afbf4a3def4c Whitespace change.
Richard M. Stallman <rms@gnu.org>
parents: 21514
diff changeset
3929 marker_position (OVERLAY_START (overlay)),
afbf4a3def4c Whitespace change.
Richard M. Stallman <rms@gnu.org>
parents: 21514
diff changeset
3930 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
3931 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
3932 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
3933
39337
b20b329387f5 Fix a typo in a comment.
Eli Zaretskii <eliz@gnu.org>
parents: 39333
diff changeset
3934 /* 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
3935 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
3936 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
3937 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
3938 if (!windows_or_buffers_changed
7af35736264f (modify_overlay): Don't do nothing if START == END;
Gerd Moellmann <gerd@gnu.org>
parents: 39087
diff changeset
3939 && (!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
3940 || !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
3941 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
3942
3533
78b4e6241f85 (Fdelete_overlay): Do nothing if overlay already deleted.
Richard M. Stallman <rms@gnu.org>
parents: 3481
diff changeset
3943 return unbind_to (count, Qnil);
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3944 }
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3945
2787
995c6e665599 * buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents: 2776
diff changeset
3946 /* Overlay dissection functions. */
995c6e665599 * buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents: 2776
diff changeset
3947
995c6e665599 * buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents: 2776
diff changeset
3948 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
3949 doc: /* Return the position at which OVERLAY starts. */)
109179
8cfee7d2955f Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109165
diff changeset
3950 (Lisp_Object overlay)
2787
995c6e665599 * buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents: 2776
diff changeset
3951 {
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40605
diff changeset
3952 CHECK_OVERLAY (overlay);
2787
995c6e665599 * buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents: 2776
diff changeset
3953
995c6e665599 * buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents: 2776
diff changeset
3954 return (Fmarker_position (OVERLAY_START (overlay)));
995c6e665599 * buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents: 2776
diff changeset
3955 }
995c6e665599 * buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents: 2776
diff changeset
3956
995c6e665599 * buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents: 2776
diff changeset
3957 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
3958 doc: /* Return the position at which OVERLAY ends. */)
109179
8cfee7d2955f Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109165
diff changeset
3959 (Lisp_Object overlay)
2787
995c6e665599 * buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents: 2776
diff changeset
3960 {
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40605
diff changeset
3961 CHECK_OVERLAY (overlay);
2787
995c6e665599 * buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents: 2776
diff changeset
3962
995c6e665599 * buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents: 2776
diff changeset
3963 return (Fmarker_position (OVERLAY_END (overlay)));
995c6e665599 * buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents: 2776
diff changeset
3964 }
995c6e665599 * buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents: 2776
diff changeset
3965
995c6e665599 * buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents: 2776
diff changeset
3966 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
3967 doc: /* Return the buffer OVERLAY belongs to.
f0a03b682c19 (Foverlay_buffer): Doc fix.
Lute Kamstra <lute@gnu.org>
parents: 59891
diff changeset
3968 Return nil if OVERLAY has been deleted. */)
109179
8cfee7d2955f Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109165
diff changeset
3969 (Lisp_Object overlay)
2787
995c6e665599 * buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents: 2776
diff changeset
3970 {
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40605
diff changeset
3971 CHECK_OVERLAY (overlay);
2787
995c6e665599 * buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents: 2776
diff changeset
3972
995c6e665599 * buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents: 2776
diff changeset
3973 return Fmarker_buffer (OVERLAY_START (overlay));
995c6e665599 * buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents: 2776
diff changeset
3974 }
995c6e665599 * buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents: 2776
diff changeset
3975
995c6e665599 * buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents: 2776
diff changeset
3976 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
3977 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
3978 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
3979 OVERLAY. */)
109179
8cfee7d2955f Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109165
diff changeset
3980 (Lisp_Object overlay)
2787
995c6e665599 * buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents: 2776
diff changeset
3981 {
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40605
diff changeset
3982 CHECK_OVERLAY (overlay);
2787
995c6e665599 * buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents: 2776
diff changeset
3983
9922
f653d8aac66a (Fmake_overlay, Foverlay_properties, Foverlay_get, Foverlay_put): Use new
Karl Heuer <kwzh@gnu.org>
parents: 9920
diff changeset
3984 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
3985 }
995c6e665599 * buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents: 2776
diff changeset
3986
995c6e665599 * buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents: 2776
diff changeset
3987
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3988 DEFUN ("overlays-at", Foverlays_at, Soverlays_at, 1, 1, 0,
78833
1a6e9c3bbc2d (Foverlays_at): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 78260
diff changeset
3989 doc: /* Return a list of the overlays that contain the character at POS. */)
109179
8cfee7d2955f Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109165
diff changeset
3990 (Lisp_Object pos)
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3991 {
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3992 int noverlays;
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3993 Lisp_Object *overlay_vec;
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3994 int len;
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3995 Lisp_Object result;
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3996
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40605
diff changeset
3997 CHECK_NUMBER_COERCE_MARKER (pos);
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3998
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
3999 len = 10;
30911
c1de0fc3a34b (Fget_buffer_create, Fmake_indirect_buffer): Avoid
Dave Love <fx@gnu.org>
parents: 30695
diff changeset
4000 /* 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
4001 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
4002
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
4003 /* 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
4004 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
4005 noverlays = overlays_at (XINT (pos), 1, &overlay_vec, &len,
92237
ce06567a933d * dispextern.h (face_at_buffer_position, face_for_overlay_string)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92215
diff changeset
4006 (EMACS_INT *) 0, (EMACS_INT *) 0, 0);
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
4007
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
4008 /* Make a list of them all. */
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
4009 result = Flist (noverlays, overlay_vec);
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
4010
2439
b6c62e4abf59 Put interrupt input blocking in a separate file from xterm.h.
Jim Blandy <jimb@redhat.com>
parents: 2389
diff changeset
4011 xfree (overlay_vec);
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
4012 return result;
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
4013 }
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
4014
12382
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
4015 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
4016 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
4017 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
4018 and also contained within the specified region.
92975
ca18807830f1 (overlays_in, Foverlays_in): Include empty overlays
Martin Rudalics <rudalics@gmx.at>
parents: 92767
diff changeset
4019 Empty overlays are included in the result if they are located at BEG,
ca18807830f1 (overlays_in, Foverlays_in): Include empty overlays
Martin Rudalics <rudalics@gmx.at>
parents: 92767
diff changeset
4020 between BEG and END, or at END provided END denotes the position at the
ca18807830f1 (overlays_in, Foverlays_in): Include empty overlays
Martin Rudalics <rudalics@gmx.at>
parents: 92767
diff changeset
4021 end of the buffer. */)
109179
8cfee7d2955f Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109165
diff changeset
4022 (Lisp_Object beg, Lisp_Object end)
12382
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
4023 {
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
4024 int noverlays;
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
4025 Lisp_Object *overlay_vec;
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
4026 int len;
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
4027 Lisp_Object result;
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
4028
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40605
diff changeset
4029 CHECK_NUMBER_COERCE_MARKER (beg);
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40605
diff changeset
4030 CHECK_NUMBER_COERCE_MARKER (end);
12382
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
4031
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
4032 len = 10;
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
4033 overlay_vec = (Lisp_Object *) xmalloc (len * sizeof (Lisp_Object));
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
4034
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
4035 /* 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
4036 Store the length in len. */
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
4037 noverlays = overlays_in (XINT (beg), XINT (end), 1, &overlay_vec, &len,
110545
6ae8bab9b79a Fix int/EMACS_INT use in buffer.c.
Eli Zaretskii <eliz@gnu.org>
parents: 110361
diff changeset
4038 NULL, NULL);
12382
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
4039
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
4040 /* Make a list of them all. */
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
4041 result = Flist (noverlays, overlay_vec);
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
4042
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
4043 xfree (overlay_vec);
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
4044 return result;
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
4045 }
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
4046
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
4047 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
4048 1, 1, 0,
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39974
diff changeset
4049 doc: /* Return the next position after POS where an overlay starts or ends.
70697
d6f5b85d7429 (Fprevious_overlay_change, Fnext_overlay_change): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 69154
diff changeset
4050 If there are no overlay boundaries from POS to (point-max),
d6f5b85d7429 (Fprevious_overlay_change, Fnext_overlay_change): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 69154
diff changeset
4051 the value is (point-max). */)
109179
8cfee7d2955f Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109165
diff changeset
4052 (Lisp_Object pos)
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
4053 {
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
4054 int noverlays;
92237
ce06567a933d * dispextern.h (face_at_buffer_position, face_for_overlay_string)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92215
diff changeset
4055 EMACS_INT endpos;
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
4056 Lisp_Object *overlay_vec;
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
4057 int len;
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
4058 int i;
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
4059
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40605
diff changeset
4060 CHECK_NUMBER_COERCE_MARKER (pos);
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
4061
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
4062 len = 10;
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
4063 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
4064
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
4065 /* 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
4066 Store the length in len.
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
4067 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
4068 noverlays = overlays_at (XINT (pos), 1, &overlay_vec, &len,
92237
ce06567a933d * dispextern.h (face_at_buffer_position, face_for_overlay_string)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92215
diff changeset
4069 &endpos, (EMACS_INT *) 0, 1);
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
4070
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
4071 /* If any of these overlays ends before endpos,
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
4072 use its ending point instead. */
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
4073 for (i = 0; i < noverlays; i++)
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
4074 {
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
4075 Lisp_Object oend;
92237
ce06567a933d * dispextern.h (face_at_buffer_position, face_for_overlay_string)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92215
diff changeset
4076 EMACS_INT oendpos;
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
4077
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
4078 oend = OVERLAY_END (overlay_vec[i]);
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
4079 oendpos = OVERLAY_POSITION (oend);
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
4080 if (oendpos < endpos)
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
4081 endpos = oendpos;
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
4082 }
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
4083
2439
b6c62e4abf59 Put interrupt input blocking in a separate file from xterm.h.
Jim Blandy <jimb@redhat.com>
parents: 2389
diff changeset
4084 xfree (overlay_vec);
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
4085 return make_number (endpos);
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
4086 }
8967
80b92977ed08 (overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents: 8924
diff changeset
4087
80b92977ed08 (overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents: 8924
diff changeset
4088 DEFUN ("previous-overlay-change", Fprevious_overlay_change,
80b92977ed08 (overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents: 8924
diff changeset
4089 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
4090 doc: /* Return the previous position before POS where an overlay starts or ends.
70697
d6f5b85d7429 (Fprevious_overlay_change, Fnext_overlay_change): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 69154
diff changeset
4091 If there are no overlay boundaries from (point-min) to POS,
d6f5b85d7429 (Fprevious_overlay_change, Fnext_overlay_change): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 69154
diff changeset
4092 the value is (point-min). */)
109179
8cfee7d2955f Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109165
diff changeset
4093 (Lisp_Object pos)
8967
80b92977ed08 (overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents: 8924
diff changeset
4094 {
80b92977ed08 (overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents: 8924
diff changeset
4095 int noverlays;
92237
ce06567a933d * dispextern.h (face_at_buffer_position, face_for_overlay_string)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92215
diff changeset
4096 EMACS_INT prevpos;
8967
80b92977ed08 (overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents: 8924
diff changeset
4097 Lisp_Object *overlay_vec;
80b92977ed08 (overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents: 8924
diff changeset
4098 int len;
80b92977ed08 (overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents: 8924
diff changeset
4099
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40605
diff changeset
4100 CHECK_NUMBER_COERCE_MARKER (pos);
8967
80b92977ed08 (overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents: 8924
diff changeset
4101
12214
c6ee462394fe (Fprevious_overlay_change): Check for overlays that end at POS.
Richard M. Stallman <rms@gnu.org>
parents: 12110
diff changeset
4102 /* 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
4103 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
4104 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
4105 return pos;
c6ee462394fe (Fprevious_overlay_change): Check for overlays that end at POS.
Richard M. Stallman <rms@gnu.org>
parents: 12110
diff changeset
4106
30360
92f92a541686 (Fprevious_overlay_change): Avoid memory leak.
Gerd Moellmann <gerd@gnu.org>
parents: 29456
diff changeset
4107 len = 10;
92f92a541686 (Fprevious_overlay_change): Avoid memory leak.
Gerd Moellmann <gerd@gnu.org>
parents: 29456
diff changeset
4108 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
4109
8967
80b92977ed08 (overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents: 8924
diff changeset
4110 /* 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
4111 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
4112 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
4113 noverlays = overlays_at (XINT (pos), 1, &overlay_vec, &len,
92237
ce06567a933d * dispextern.h (face_at_buffer_position, face_for_overlay_string)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92215
diff changeset
4114 (EMACS_INT *) 0, &prevpos, 1);
8967
80b92977ed08 (overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents: 8924
diff changeset
4115
80b92977ed08 (overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents: 8924
diff changeset
4116 xfree (overlay_vec);
80b92977ed08 (overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents: 8924
diff changeset
4117 return make_number (prevpos);
80b92977ed08 (overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents: 8924
diff changeset
4118 }
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
4119
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
4120 /* These functions are for debugging overlays. */
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
4121
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
4122 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
4123 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
4124 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
4125 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
4126 Recentering overlays moves overlays between these lists.
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
4127 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
4128 However, the overlays you get are the real objects that the buffer uses. */)
109179
8cfee7d2955f Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109165
diff changeset
4129 (void)
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
4130 {
51844
c5036e7cc93b (overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51827
diff changeset
4131 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
4132 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
4133 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
4134 {
c5036e7cc93b (overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51827
diff changeset
4135 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
4136 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
4137 }
c5036e7cc93b (overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51827
diff changeset
4138 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
4139 {
c5036e7cc93b (overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51827
diff changeset
4140 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
4141 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
4142 }
c5036e7cc93b (overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51827
diff changeset
4143 return Fcons (Fnreverse (before), Fnreverse (after));
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
4144 }
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
4145
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
4146 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
4147 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
4148 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
4149 for positions far away from POS). */)
109179
8cfee7d2955f Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109165
diff changeset
4150 (Lisp_Object pos)
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
4151 {
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40605
diff changeset
4152 CHECK_NUMBER_COERCE_MARKER (pos);
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
4153
2508
3aa2f3b35353 * buffer.c (Fmake_overlay, Fmove_overlay): New optional BUFFER
Jim Blandy <jimb@redhat.com>
parents: 2486
diff changeset
4154 recenter_overlay_lists (current_buffer, XINT (pos));
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
4155 return Qnil;
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
4156 }
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
4157
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
4158 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
4159 doc: /* Get the property of overlay OVERLAY with property name PROP. */)
109179
8cfee7d2955f Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109165
diff changeset
4160 (Lisp_Object overlay, Lisp_Object prop)
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
4161 {
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40605
diff changeset
4162 CHECK_OVERLAY (overlay);
45683
9e40bb8e9a60 (Foverlay_get): Use lookup_char_property.
Colin Walters <walters@gnu.org>
parents: 45626
diff changeset
4163 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
4164 }
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
4165
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
4166 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
4167 doc: /* Set one property of overlay OVERLAY: give property PROP value VALUE. */)
109179
8cfee7d2955f Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109165
diff changeset
4168 (Lisp_Object overlay, Lisp_Object prop, Lisp_Object value)
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
4169 {
9922
f653d8aac66a (Fmake_overlay, Foverlay_properties, Foverlay_get, Foverlay_put): Use new
Karl Heuer <kwzh@gnu.org>
parents: 9920
diff changeset
4170 Lisp_Object tail, buffer;
8839
41981db9ad8e (Qevaporate): New symbol.
Karl Heuer <kwzh@gnu.org>
parents: 8818
diff changeset
4171 int changed;
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
4172
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40605
diff changeset
4173 CHECK_OVERLAY (overlay);
2722
16db9d1af886 Arrange to tell redisplay about changes in overlays.
Jim Blandy <jimb@redhat.com>
parents: 2645
diff changeset
4174
8062
ad595e4e165c (send_process): Major rewrite.
Richard M. Stallman <rms@gnu.org>
parents: 8035
diff changeset
4175 buffer = Fmarker_buffer (OVERLAY_START (overlay));
ad595e4e165c (send_process): Major rewrite.
Richard M. Stallman <rms@gnu.org>
parents: 8035
diff changeset
4176
9922
f653d8aac66a (Fmake_overlay, Foverlay_properties, Foverlay_get, Foverlay_put): Use new
Karl Heuer <kwzh@gnu.org>
parents: 9920
diff changeset
4177 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
4178 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
4179 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
4180 if (EQ (XCAR (tail), prop))
8062
ad595e4e165c (send_process): Major rewrite.
Richard M. Stallman <rms@gnu.org>
parents: 8035
diff changeset
4181 {
26164
d39ec0a27081 more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents: 26088
diff changeset
4182 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
4183 XSETCAR (XCDR (tail), value);
8839
41981db9ad8e (Qevaporate): New symbol.
Karl Heuer <kwzh@gnu.org>
parents: 8818
diff changeset
4184 goto found;
8062
ad595e4e165c (send_process): Major rewrite.
Richard M. Stallman <rms@gnu.org>
parents: 8035
diff changeset
4185 }
8839
41981db9ad8e (Qevaporate): New symbol.
Karl Heuer <kwzh@gnu.org>
parents: 8818
diff changeset
4186 /* 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
4187 changed = !NILP (value);
9922
f653d8aac66a (Fmake_overlay, Foverlay_properties, Foverlay_get, Foverlay_put): Use new
Karl Heuer <kwzh@gnu.org>
parents: 9920
diff changeset
4188 XOVERLAY (overlay)->plist
f653d8aac66a (Fmake_overlay, Foverlay_properties, Foverlay_get, Foverlay_put): Use new
Karl Heuer <kwzh@gnu.org>
parents: 9920
diff changeset
4189 = Fcons (prop, Fcons (value, XOVERLAY (overlay)->plist));
8839
41981db9ad8e (Qevaporate): New symbol.
Karl Heuer <kwzh@gnu.org>
parents: 8818
diff changeset
4190 found:
41981db9ad8e (Qevaporate): New symbol.
Karl Heuer <kwzh@gnu.org>
parents: 8818
diff changeset
4191 if (! NILP (buffer))
41981db9ad8e (Qevaporate): New symbol.
Karl Heuer <kwzh@gnu.org>
parents: 8818
diff changeset
4192 {
41981db9ad8e (Qevaporate): New symbol.
Karl Heuer <kwzh@gnu.org>
parents: 8818
diff changeset
4193 if (changed)
16193
6ff2ef91c618 (modify_overlay): Renamed from redisplay_region
Richard M. Stallman <rms@gnu.org>
parents: 16144
diff changeset
4194 modify_overlay (XBUFFER (buffer),
39333
7af35736264f (modify_overlay): Don't do nothing if START == END;
Gerd Moellmann <gerd@gnu.org>
parents: 39087
diff changeset
4195 marker_position (OVERLAY_START (overlay)),
7af35736264f (modify_overlay): Don't do nothing if START == END;
Gerd Moellmann <gerd@gnu.org>
parents: 39087
diff changeset
4196 marker_position (OVERLAY_END (overlay)));
8839
41981db9ad8e (Qevaporate): New symbol.
Karl Heuer <kwzh@gnu.org>
parents: 8818
diff changeset
4197 if (EQ (prop, Qevaporate) && ! NILP (value)
41981db9ad8e (Qevaporate): New symbol.
Karl Heuer <kwzh@gnu.org>
parents: 8818
diff changeset
4198 && (OVERLAY_POSITION (OVERLAY_START (overlay))
41981db9ad8e (Qevaporate): New symbol.
Karl Heuer <kwzh@gnu.org>
parents: 8818
diff changeset
4199 == OVERLAY_POSITION (OVERLAY_END (overlay))))
41981db9ad8e (Qevaporate): New symbol.
Karl Heuer <kwzh@gnu.org>
parents: 8818
diff changeset
4200 Fdelete_overlay (overlay);
41981db9ad8e (Qevaporate): New symbol.
Karl Heuer <kwzh@gnu.org>
parents: 8818
diff changeset
4201 }
69153
1f7111323584 * buffer.c (Foverlay_put): Mark buffer as changed.
Chong Yidong <cyd@stupidchicken.com>
parents: 69144
diff changeset
4202
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
4203 return value;
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
4204 }
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
4205
12538
5920994b14c2 (last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 12488
diff changeset
4206 /* Subroutine of report_overlay_modification. */
5920994b14c2 (last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 12488
diff changeset
4207
5920994b14c2 (last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 12488
diff changeset
4208 /* Lisp vector holding overlay hook functions to call.
5920994b14c2 (last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 12488
diff changeset
4209 Vector elements come in pairs.
5920994b14c2 (last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 12488
diff changeset
4210 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
4211 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
4212
5920994b14c2 (last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 12488
diff changeset
4213 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
4214 as we call overlay hook functions.
5920994b14c2 (last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 12488
diff changeset
4215 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
4216 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
4217 static Lisp_Object last_overlay_modification_hooks;
5920994b14c2 (last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 12488
diff changeset
4218
5920994b14c2 (last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 12488
diff changeset
4219 /* 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
4220 static int last_overlay_modification_hooks_used;
5920994b14c2 (last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 12488
diff changeset
4221
5920994b14c2 (last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 12488
diff changeset
4222 /* Add one functionlist/overlay pair
5920994b14c2 (last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 12488
diff changeset
4223 to the end of last_overlay_modification_hooks. */
5920994b14c2 (last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 12488
diff changeset
4224
5920994b14c2 (last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 12488
diff changeset
4225 static void
109144
7dceae91724c Convert most remaining function definitions to standard C.
Juanma Barranquero <lekktu@gmail.com>
parents: 109100
diff changeset
4226 add_overlay_mod_hooklist (Lisp_Object functionlist, Lisp_Object overlay)
12538
5920994b14c2 (last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 12488
diff changeset
4227 {
5920994b14c2 (last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 12488
diff changeset
4228 int oldsize = XVECTOR (last_overlay_modification_hooks)->size;
5920994b14c2 (last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 12488
diff changeset
4229
5920994b14c2 (last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 12488
diff changeset
4230 if (last_overlay_modification_hooks_used == oldsize)
108890
d9257436d2b1 Remove obsolete macro BASE_LEADING_CODE_P.
Juanma Barranquero <lekktu@gmail.com>
parents: 108880
diff changeset
4231 last_overlay_modification_hooks = larger_vector
85242
9b00632ffdf2 (add_overlay_mod_hooklist): Use larger_vector.
Eli Zaretskii <eliz@gnu.org>
parents: 85114
diff changeset
4232 (last_overlay_modification_hooks, oldsize * 2, Qnil);
91607
d1e53221c4aa * xselect.c (x_handle_dnd_message):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 91367
diff changeset
4233 ASET (last_overlay_modification_hooks, last_overlay_modification_hooks_used,
d1e53221c4aa * xselect.c (x_handle_dnd_message):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 91367
diff changeset
4234 functionlist); last_overlay_modification_hooks_used++;
d1e53221c4aa * xselect.c (x_handle_dnd_message):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 91367
diff changeset
4235 ASET (last_overlay_modification_hooks, last_overlay_modification_hooks_used,
d1e53221c4aa * xselect.c (x_handle_dnd_message):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 91367
diff changeset
4236 overlay); last_overlay_modification_hooks_used++;
12538
5920994b14c2 (last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 12488
diff changeset
4237 }
5920994b14c2 (last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 12488
diff changeset
4238
4077
a860278e3ab3 (verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents: 3884
diff changeset
4239 /* Run the modification-hooks of overlays that include
a860278e3ab3 (verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents: 3884
diff changeset
4240 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
4241 If this change is an insertion, also
5920994b14c2 (last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 12488
diff changeset
4242 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
4243 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
4244
24032289479c (report_overlay_modification): Renamed from verify_overlay_modification.
Richard M. Stallman <rms@gnu.org>
parents: 10143
diff changeset
4245 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
4246 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
4247
12538
5920994b14c2 (last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 12488
diff changeset
4248 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
4249 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
4250 the position after the inserted new text,
5920994b14c2 (last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 12488
diff changeset
4251 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
4252
a860278e3ab3 (verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents: 3884
diff changeset
4253 void
109144
7dceae91724c Convert most remaining function definitions to standard C.
Juanma Barranquero <lekktu@gmail.com>
parents: 109100
diff changeset
4254 report_overlay_modification (Lisp_Object start, Lisp_Object end, int after,
7dceae91724c Convert most remaining function definitions to standard C.
Juanma Barranquero <lekktu@gmail.com>
parents: 109100
diff changeset
4255 Lisp_Object arg1, Lisp_Object arg2, Lisp_Object arg3)
4077
a860278e3ab3 (verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents: 3884
diff changeset
4256 {
51844
c5036e7cc93b (overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51827
diff changeset
4257 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
4258 struct Lisp_Overlay *tail;
12538
5920994b14c2 (last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 12488
diff changeset
4259 /* 1 if this change is an insertion. */
5920994b14c2 (last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 12488
diff changeset
4260 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
4261 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
4262
b3be53811505 (verify_overlay_modification): GCPRO tail and overlay.
Richard M. Stallman <rms@gnu.org>
parents: 7520
diff changeset
4263 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
4264 tail = NULL;
51827
8f62ae8e410c (report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51824
diff changeset
4265
51939
d38453fdf2a0 (copy_overlays): Use EMACS_INT for positions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51867
diff changeset
4266 /* 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
4267 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
4268 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
4269 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
4270 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
4271 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
4272 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
4273
51827
8f62ae8e410c (report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51824
diff changeset
4274 if (!after)
12538
5920994b14c2 (last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 12488
diff changeset
4275 {
51827
8f62ae8e410c (report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51824
diff changeset
4276 /* 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
4277 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
4278 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
4279 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
4280 {
110545
6ae8bab9b79a Fix int/EMACS_INT use in buffer.c.
Eli Zaretskii <eliz@gnu.org>
parents: 110361
diff changeset
4281 EMACS_INT startpos, endpos;
51827
8f62ae8e410c (report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51824
diff changeset
4282 Lisp_Object ostart, oend;
8f62ae8e410c (report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51824
diff changeset
4283
51844
c5036e7cc93b (overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51827
diff changeset
4284 XSETMISC (overlay, tail);
51827
8f62ae8e410c (report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51824
diff changeset
4285
8f62ae8e410c (report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51824
diff changeset
4286 ostart = OVERLAY_START (overlay);
8f62ae8e410c (report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51824
diff changeset
4287 oend = OVERLAY_END (overlay);
8f62ae8e410c (report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51824
diff changeset
4288 endpos = OVERLAY_POSITION (oend);
8f62ae8e410c (report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51824
diff changeset
4289 if (XFASTINT (start) > endpos)
8f62ae8e410c (report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51824
diff changeset
4290 break;
8f62ae8e410c (report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51824
diff changeset
4291 startpos = OVERLAY_POSITION (ostart);
8f62ae8e410c (report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51824
diff changeset
4292 if (insertion && (XFASTINT (start) == startpos
8f62ae8e410c (report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51824
diff changeset
4293 || XFASTINT (end) == startpos))
6591
60f70854e73f (verify_overlay_modification):
Richard M. Stallman <rms@gnu.org>
parents: 6493
diff changeset
4294 {
51827
8f62ae8e410c (report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51824
diff changeset
4295 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
4296 if (!NILP (prop))
8f62ae8e410c (report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51824
diff changeset
4297 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
4298 }
8f62ae8e410c (report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51824
diff changeset
4299 if (insertion && (XFASTINT (start) == endpos
8f62ae8e410c (report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51824
diff changeset
4300 || XFASTINT (end) == endpos))
8f62ae8e410c (report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51824
diff changeset
4301 {
8f62ae8e410c (report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51824
diff changeset
4302 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
4303 if (!NILP (prop))
8f62ae8e410c (report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51824
diff changeset
4304 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
4305 }
8f62ae8e410c (report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51824
diff changeset
4306 /* 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
4307 for both insertion and deletion. */
8f62ae8e410c (report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51824
diff changeset
4308 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
4309 {
8f62ae8e410c (report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51824
diff changeset
4310 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
4311 if (!NILP (prop))
8f62ae8e410c (report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51824
diff changeset
4312 add_overlay_mod_hooklist (prop, overlay);
6591
60f70854e73f (verify_overlay_modification):
Richard M. Stallman <rms@gnu.org>
parents: 6493
diff changeset
4313 }
4077
a860278e3ab3 (verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents: 3884
diff changeset
4314 }
55242
d57364949309 (syms_of_buffer) <line-spacing>: Allow float value.
Kim F. Storm <storm@cua.dk>
parents: 55140
diff changeset
4315
51844
c5036e7cc93b (overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51827
diff changeset
4316 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
4317 {
110545
6ae8bab9b79a Fix int/EMACS_INT use in buffer.c.
Eli Zaretskii <eliz@gnu.org>
parents: 110361
diff changeset
4318 EMACS_INT startpos, endpos;
51827
8f62ae8e410c (report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51824
diff changeset
4319 Lisp_Object ostart, oend;
8f62ae8e410c (report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51824
diff changeset
4320
51844
c5036e7cc93b (overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51827
diff changeset
4321 XSETMISC (overlay, tail);
51827
8f62ae8e410c (report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51824
diff changeset
4322
8f62ae8e410c (report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51824
diff changeset
4323 ostart = OVERLAY_START (overlay);
8f62ae8e410c (report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51824
diff changeset
4324 oend = OVERLAY_END (overlay);
8f62ae8e410c (report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51824
diff changeset
4325 startpos = OVERLAY_POSITION (ostart);
8f62ae8e410c (report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51824
diff changeset
4326 endpos = OVERLAY_POSITION (oend);
8f62ae8e410c (report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51824
diff changeset
4327 if (XFASTINT (end) < startpos)
8f62ae8e410c (report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51824
diff changeset
4328 break;
8f62ae8e410c (report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51824
diff changeset
4329 if (insertion && (XFASTINT (start) == startpos
8f62ae8e410c (report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51824
diff changeset
4330 || XFASTINT (end) == startpos))
6591
60f70854e73f (verify_overlay_modification):
Richard M. Stallman <rms@gnu.org>
parents: 6493
diff changeset
4331 {
51827
8f62ae8e410c (report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51824
diff changeset
4332 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
4333 if (!NILP (prop))
8f62ae8e410c (report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51824
diff changeset
4334 add_overlay_mod_hooklist (prop, overlay);
6591
60f70854e73f (verify_overlay_modification):
Richard M. Stallman <rms@gnu.org>
parents: 6493
diff changeset
4335 }
51827
8f62ae8e410c (report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51824
diff changeset
4336 if (insertion && (XFASTINT (start) == endpos
8f62ae8e410c (report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51824
diff changeset
4337 || XFASTINT (end) == endpos))
6591
60f70854e73f (verify_overlay_modification):
Richard M. Stallman <rms@gnu.org>
parents: 6493
diff changeset
4338 {
51827
8f62ae8e410c (report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51824
diff changeset
4339 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
4340 if (!NILP (prop))
8f62ae8e410c (report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51824
diff changeset
4341 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
4342 }
8f62ae8e410c (report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51824
diff changeset
4343 /* 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
4344 for both insertion and deletion. */
8f62ae8e410c (report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51824
diff changeset
4345 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
4346 {
8f62ae8e410c (report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51824
diff changeset
4347 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
4348 if (!NILP (prop))
8f62ae8e410c (report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51824
diff changeset
4349 add_overlay_mod_hooklist (prop, overlay);
6591
60f70854e73f (verify_overlay_modification):
Richard M. Stallman <rms@gnu.org>
parents: 6493
diff changeset
4350 }
4077
a860278e3ab3 (verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents: 3884
diff changeset
4351 }
a860278e3ab3 (verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents: 3884
diff changeset
4352 }
a860278e3ab3 (verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents: 3884
diff changeset
4353
51827
8f62ae8e410c (report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51824
diff changeset
4354 GCPRO4 (overlay, arg1, arg2, arg3);
8f62ae8e410c (report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51824
diff changeset
4355 {
8f62ae8e410c (report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51824
diff changeset
4356 /* 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
4357 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
4358 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
4359 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
4360 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
4361 int i;
8f62ae8e410c (report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51824
diff changeset
4362
109165
750db9f3e6d8 Replace bcopy, bzero, bcmp by memcpy, memmove, memset, memcmp
Andreas Schwab <schwab@linux-m68k.org>
parents: 109144
diff changeset
4363 memcpy (copy, XVECTOR (last_overlay_modification_hooks)->contents,
750db9f3e6d8 Replace bcopy, bzero, bcmp by memcpy, memmove, memset, memcmp
Andreas Schwab <schwab@linux-m68k.org>
parents: 109144
diff changeset
4364 size * sizeof (Lisp_Object));
51827
8f62ae8e410c (report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51824
diff changeset
4365 gcpro1.var = copy;
8f62ae8e410c (report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51824
diff changeset
4366 gcpro1.nvars = size;
8f62ae8e410c (report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51824
diff changeset
4367
8f62ae8e410c (report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51824
diff changeset
4368 for (i = 0; i < size;)
8f62ae8e410c (report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51824
diff changeset
4369 {
8f62ae8e410c (report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51824
diff changeset
4370 Lisp_Object prop, overlay;
8f62ae8e410c (report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51824
diff changeset
4371 prop = copy[i++];
8f62ae8e410c (report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51824
diff changeset
4372 overlay = copy[i++];
8f62ae8e410c (report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51824
diff changeset
4373 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
4374 }
8f62ae8e410c (report_overlay_modification): Don't run hooks while
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51824
diff changeset
4375 }
7670
b3be53811505 (verify_overlay_modification): GCPRO tail and overlay.
Richard M. Stallman <rms@gnu.org>
parents: 7520
diff changeset
4376 UNGCPRO;
4077
a860278e3ab3 (verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents: 3884
diff changeset
4377 }
a860278e3ab3 (verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents: 3884
diff changeset
4378
a860278e3ab3 (verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents: 3884
diff changeset
4379 static void
109144
7dceae91724c Convert most remaining function definitions to standard C.
Juanma Barranquero <lekktu@gmail.com>
parents: 109100
diff changeset
4380 call_overlay_mod_hooks (Lisp_Object list, Lisp_Object overlay, int after,
7dceae91724c Convert most remaining function definitions to standard C.
Juanma Barranquero <lekktu@gmail.com>
parents: 109100
diff changeset
4381 Lisp_Object arg1, Lisp_Object arg2, Lisp_Object arg3)
4077
a860278e3ab3 (verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents: 3884
diff changeset
4382 {
10146
24032289479c (report_overlay_modification): Renamed from verify_overlay_modification.
Richard M. Stallman <rms@gnu.org>
parents: 10143
diff changeset
4383 struct gcpro gcpro1, gcpro2, gcpro3, gcpro4;
12538
5920994b14c2 (last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 12488
diff changeset
4384
10146
24032289479c (report_overlay_modification): Renamed from verify_overlay_modification.
Richard M. Stallman <rms@gnu.org>
parents: 10143
diff changeset
4385 GCPRO4 (list, arg1, arg2, arg3);
12538
5920994b14c2 (last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 12488
diff changeset
4386
47972
287494c5e770 (assoc_ignore_text_properties, Fother_buffer, Fkill_buffer)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 46920
diff changeset
4387 while (CONSP (list))
4077
a860278e3ab3 (verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents: 3884
diff changeset
4388 {
10146
24032289479c (report_overlay_modification): Renamed from verify_overlay_modification.
Richard M. Stallman <rms@gnu.org>
parents: 10143
diff changeset
4389 if (NILP (arg3))
47972
287494c5e770 (assoc_ignore_text_properties, Fother_buffer, Fkill_buffer)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 46920
diff changeset
4390 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
4391 else
47972
287494c5e770 (assoc_ignore_text_properties, Fother_buffer, Fkill_buffer)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 46920
diff changeset
4392 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
4393 list = XCDR (list);
4077
a860278e3ab3 (verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents: 3884
diff changeset
4394 }
a860278e3ab3 (verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents: 3884
diff changeset
4395 UNGCPRO;
a860278e3ab3 (verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents: 3884
diff changeset
4396 }
8839
41981db9ad8e (Qevaporate): New symbol.
Karl Heuer <kwzh@gnu.org>
parents: 8818
diff changeset
4397
41981db9ad8e (Qevaporate): New symbol.
Karl Heuer <kwzh@gnu.org>
parents: 8818
diff changeset
4398 /* Delete any zero-sized overlays at position POS, if the `evaporate'
41981db9ad8e (Qevaporate): New symbol.
Karl Heuer <kwzh@gnu.org>
parents: 8818
diff changeset
4399 property is set. */
41981db9ad8e (Qevaporate): New symbol.
Karl Heuer <kwzh@gnu.org>
parents: 8818
diff changeset
4400 void
109144
7dceae91724c Convert most remaining function definitions to standard C.
Juanma Barranquero <lekktu@gmail.com>
parents: 109100
diff changeset
4401 evaporate_overlays (EMACS_INT pos)
8839
41981db9ad8e (Qevaporate): New symbol.
Karl Heuer <kwzh@gnu.org>
parents: 8818
diff changeset
4402 {
51844
c5036e7cc93b (overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51827
diff changeset
4403 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
4404 struct Lisp_Overlay *tail;
8839
41981db9ad8e (Qevaporate): New symbol.
Karl Heuer <kwzh@gnu.org>
parents: 8818
diff changeset
4405
41981db9ad8e (Qevaporate): New symbol.
Karl Heuer <kwzh@gnu.org>
parents: 8818
diff changeset
4406 hit_list = Qnil;
51824
9f5665eb77bd (reset_buffer, recenter_overlay_lists)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51782
diff changeset
4407 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
4408 for (tail = current_buffer->overlays_before; tail; tail = tail->next)
8839
41981db9ad8e (Qevaporate): New symbol.
Karl Heuer <kwzh@gnu.org>
parents: 8818
diff changeset
4409 {
110545
6ae8bab9b79a Fix int/EMACS_INT use in buffer.c.
Eli Zaretskii <eliz@gnu.org>
parents: 110361
diff changeset
4410 EMACS_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
4411 XSETMISC (overlay, tail);
8839
41981db9ad8e (Qevaporate): New symbol.
Karl Heuer <kwzh@gnu.org>
parents: 8818
diff changeset
4412 endpos = OVERLAY_POSITION (OVERLAY_END (overlay));
41981db9ad8e (Qevaporate): New symbol.
Karl Heuer <kwzh@gnu.org>
parents: 8818
diff changeset
4413 if (endpos < pos)
41981db9ad8e (Qevaporate): New symbol.
Karl Heuer <kwzh@gnu.org>
parents: 8818
diff changeset
4414 break;
41981db9ad8e (Qevaporate): New symbol.
Karl Heuer <kwzh@gnu.org>
parents: 8818
diff changeset
4415 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
4416 && ! NILP (Foverlay_get (overlay, Qevaporate)))
8839
41981db9ad8e (Qevaporate): New symbol.
Karl Heuer <kwzh@gnu.org>
parents: 8818
diff changeset
4417 hit_list = Fcons (overlay, hit_list);
41981db9ad8e (Qevaporate): New symbol.
Karl Heuer <kwzh@gnu.org>
parents: 8818
diff changeset
4418 }
41981db9ad8e (Qevaporate): New symbol.
Karl Heuer <kwzh@gnu.org>
parents: 8818
diff changeset
4419 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
4420 for (tail = current_buffer->overlays_after; tail; tail = tail->next)
8839
41981db9ad8e (Qevaporate): New symbol.
Karl Heuer <kwzh@gnu.org>
parents: 8818
diff changeset
4421 {
110545
6ae8bab9b79a Fix int/EMACS_INT use in buffer.c.
Eli Zaretskii <eliz@gnu.org>
parents: 110361
diff changeset
4422 EMACS_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
4423 XSETMISC (overlay, tail);
8839
41981db9ad8e (Qevaporate): New symbol.
Karl Heuer <kwzh@gnu.org>
parents: 8818
diff changeset
4424 startpos = OVERLAY_POSITION (OVERLAY_START (overlay));
41981db9ad8e (Qevaporate): New symbol.
Karl Heuer <kwzh@gnu.org>
parents: 8818
diff changeset
4425 if (startpos > pos)
41981db9ad8e (Qevaporate): New symbol.
Karl Heuer <kwzh@gnu.org>
parents: 8818
diff changeset
4426 break;
41981db9ad8e (Qevaporate): New symbol.
Karl Heuer <kwzh@gnu.org>
parents: 8818
diff changeset
4427 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
4428 && ! NILP (Foverlay_get (overlay, Qevaporate)))
8839
41981db9ad8e (Qevaporate): New symbol.
Karl Heuer <kwzh@gnu.org>
parents: 8818
diff changeset
4429 hit_list = Fcons (overlay, hit_list);
41981db9ad8e (Qevaporate): New symbol.
Karl Heuer <kwzh@gnu.org>
parents: 8818
diff changeset
4430 }
26164
d39ec0a27081 more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents: 26088
diff changeset
4431 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
4432 Fdelete_overlay (XCAR (hit_list));
8839
41981db9ad8e (Qevaporate): New symbol.
Karl Heuer <kwzh@gnu.org>
parents: 8818
diff changeset
4433 }
4077
a860278e3ab3 (verify_overlay_modification): New function.
Richard M. Stallman <rms@gnu.org>
parents: 3884
diff changeset
4434
9464
4bb620c9a075 (buffer_slot_type_mismatch): Take just the offset as argument. Only check
Karl Heuer <kwzh@gnu.org>
parents: 9438
diff changeset
4435 /* 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
4436 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
4437
1001
c1ebe69206df * buffer.c (syms_of_buffer): Call DEFVAR_PER_BUFFER with the new
Jim Blandy <jimb@redhat.com>
parents: 764
diff changeset
4438 void
109144
7dceae91724c Convert most remaining function definitions to standard C.
Juanma Barranquero <lekktu@gmail.com>
parents: 109100
diff changeset
4439 buffer_slot_type_mismatch (Lisp_Object newval, int type)
1001
c1ebe69206df * buffer.c (syms_of_buffer): Call DEFVAR_PER_BUFFER with the new
Jim Blandy <jimb@redhat.com>
parents: 764
diff changeset
4440 {
95112
0835cb21d60e * lisp.h (indirect_variable):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94963
diff changeset
4441 Lisp_Object predicate;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49444
diff changeset
4442
86285
59344cb482f3 * lisp.h (struct Lisp_Buffer_Objfwd): Add a `slottype' field.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 86230
diff changeset
4443 switch (type)
1001
c1ebe69206df * buffer.c (syms_of_buffer): Call DEFVAR_PER_BUFFER with the new
Jim Blandy <jimb@redhat.com>
parents: 764
diff changeset
4444 {
105885
8103235103a7 Let integers use up 2 tags to give them one extra bit and double their range.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 105877
diff changeset
4445 case_Lisp_Int: predicate = Qintegerp; break;
95112
0835cb21d60e * lisp.h (indirect_variable):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94963
diff changeset
4446 case Lisp_String: predicate = Qstringp; break;
0835cb21d60e * lisp.h (indirect_variable):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94963
diff changeset
4447 case Lisp_Symbol: predicate = Qsymbolp; break;
0835cb21d60e * lisp.h (indirect_variable):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94963
diff changeset
4448 default: abort ();
1001
c1ebe69206df * buffer.c (syms_of_buffer): Call DEFVAR_PER_BUFFER with the new
Jim Blandy <jimb@redhat.com>
parents: 764
diff changeset
4449 }
c1ebe69206df * buffer.c (syms_of_buffer): Call DEFVAR_PER_BUFFER with the new
Jim Blandy <jimb@redhat.com>
parents: 764
diff changeset
4450
95112
0835cb21d60e * lisp.h (indirect_variable):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94963
diff changeset
4451 wrong_type_argument (predicate, newval);
1001
c1ebe69206df * buffer.c (syms_of_buffer): Call DEFVAR_PER_BUFFER with the new
Jim Blandy <jimb@redhat.com>
parents: 764
diff changeset
4452 }
28314
c46e609d887a (buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents: 28207
diff changeset
4453
1001
c1ebe69206df * buffer.c (syms_of_buffer): Call DEFVAR_PER_BUFFER with the new
Jim Blandy <jimb@redhat.com>
parents: 764
diff changeset
4454
31604
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4455 /***********************************************************************
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4456 Allocation with mmap
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4457 ***********************************************************************/
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 #ifdef USE_MMAP_FOR_BUFFERS
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 #include <sys/types.h>
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4462 #include <sys/mman.h>
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4463
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4464 #ifndef MAP_ANON
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4465 #ifdef MAP_ANONYMOUS
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4466 #define MAP_ANON MAP_ANONYMOUS
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4467 #else
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4468 #define MAP_ANON 0
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4469 #endif
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4470 #endif
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4471
33645
e822f94eb7d9 (MAP_FAILED): Define it as `((void *) -1)' if it's
Gerd Moellmann <gerd@gnu.org>
parents: 33598
diff changeset
4472 #ifndef MAP_FAILED
e822f94eb7d9 (MAP_FAILED): Define it as `((void *) -1)' if it's
Gerd Moellmann <gerd@gnu.org>
parents: 33598
diff changeset
4473 #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
4474 #endif
e822f94eb7d9 (MAP_FAILED): Define it as `((void *) -1)' if it's
Gerd Moellmann <gerd@gnu.org>
parents: 33598
diff changeset
4475
31604
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4476 #include <stdio.h>
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4477
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4478 #if MAP_ANON == 0
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4479 #include <fcntl.h>
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4480 #endif
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4481
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4482 #include "coding.h"
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4483
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4484
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4485 /* 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
4486 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
4487 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
4488 trying to enlarge regions.
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4489
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4490 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
4491 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
4492
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4493 +-----------------------+
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4494 | struct mmap_info + |
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4495 | padding |
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4496 +-----------------------+
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4497 | user data |
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4498 | |
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4499 | |
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4500 +-----------------------+ */
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4501
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4502 struct mmap_region
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 /* User-specified size. */
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4505 size_t nbytes_specified;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49444
diff changeset
4506
31604
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4507 /* Number of bytes mapped */
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4508 size_t nbytes_mapped;
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4509
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4510 /* 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
4511 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
4512 after this structure. */
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4513 POINTER_TYPE **var;
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4514
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4515 /* 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
4516 struct mmap_region *next, *prev;
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
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4519 /* 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
4520
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4521 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
4522
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4523 /* 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
4524 /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
4525
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4526 static int mmap_fd;
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4527
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4528 /* 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
4529
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4530 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
4531 static int mmap_fd_1;
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4532
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4533 /* Page size on this system. */
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 static int mmap_page_size;
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4536
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4537 /* 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
4538
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4539 static int mmap_initialized_p;
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4540
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4541 /* 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
4542
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4543 #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
4544
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4545 /* 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
4546
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4547 #define MMAP_REGION_STRUCT_SIZE \
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4548 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
4549
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4550 /* 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
4551 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
4552
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4553 #define MMAP_REGION(P) \
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4554 ((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
4555
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4556 /* 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
4557 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
4558
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4559 #define MMAP_USER_AREA(P) \
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4560 ((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
4561
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4562 #define MEM_ALIGN sizeof (double)
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4563
48090
b7e13d33cf41 Comment.
Dave Love <fx@gnu.org>
parents: 47972
diff changeset
4564 /* Predicate returning true if part of the address range [START .. END]
b7e13d33cf41 Comment.
Dave Love <fx@gnu.org>
parents: 47972
diff changeset
4565 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
4566 memory mapping.
c54f8a37564e (MMAP_ALLOCATED_P): New macro to be set from system
Gerd Moellmann <gerd@gnu.org>
parents: 43712
diff changeset
4567
c54f8a37564e (MMAP_ALLOCATED_P): New macro to be set from system
Gerd Moellmann <gerd@gnu.org>
parents: 43712
diff changeset
4568 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
4569 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
4570 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
4571
c54f8a37564e (MMAP_ALLOCATED_P): New macro to be set from system
Gerd Moellmann <gerd@gnu.org>
parents: 43712
diff changeset
4572 #ifndef MMAP_ALLOCATED_P
c54f8a37564e (MMAP_ALLOCATED_P): New macro to be set from system
Gerd Moellmann <gerd@gnu.org>
parents: 43712
diff changeset
4573 #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
4574 #endif
c54f8a37564e (MMAP_ALLOCATED_P): New macro to be set from system
Gerd Moellmann <gerd@gnu.org>
parents: 43712
diff changeset
4575
31604
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4576 /* Function prototypes. */
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4577
109100
2bc9a0c04c87 Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents: 108890
diff changeset
4578 static int mmap_free_1 (struct mmap_region *);
2bc9a0c04c87 Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents: 108890
diff changeset
4579 static int mmap_enlarge (struct mmap_region *, int);
2bc9a0c04c87 Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents: 108890
diff changeset
4580 static struct mmap_region *mmap_find (POINTER_TYPE *, POINTER_TYPE *);
2bc9a0c04c87 Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents: 108890
diff changeset
4581 static POINTER_TYPE *mmap_alloc (POINTER_TYPE **, size_t);
2bc9a0c04c87 Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents: 108890
diff changeset
4582 static POINTER_TYPE *mmap_realloc (POINTER_TYPE **, size_t);
2bc9a0c04c87 Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents: 108890
diff changeset
4583 static void mmap_free (POINTER_TYPE **ptr);
2bc9a0c04c87 Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents: 108890
diff changeset
4584 static void mmap_init (void);
31604
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4585
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4586
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4587 /* 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
4588 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
4589 is at END - 1. */
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4590
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4591 static struct mmap_region *
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4592 mmap_find (start, end)
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4593 POINTER_TYPE *start, *end;
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4594 {
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4595 struct mmap_region *r;
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4596 char *s = (char *) start, *e = (char *) end;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49444
diff changeset
4597
31604
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4598 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
4599 {
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4600 char *rstart = (char *) r;
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4601 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
4602
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4603 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
4604 (s >= rstart && s < rend)
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4605 /* 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
4606 || (e > rstart && e <= rend)
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4607 /* 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
4608 || (rstart >= s && rstart < e)
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4609 /* 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
4610 || (rend > s && rend <= e))
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4611 break;
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 return r;
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4615 }
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4616
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4617
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4618 /* 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
4619 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
4620
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4621 static int
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4622 mmap_free_1 (r)
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4623 struct mmap_region *r;
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 if (r->next)
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4626 r->next->prev = r->prev;
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4627 if (r->prev)
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4628 r->prev->next = r->next;
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4629 else
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4630 mmap_regions = r->next;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49444
diff changeset
4631
33675
cd12ade4547d (mmap_free_1): Avoid a compiler warning.
Gerd Moellmann <gerd@gnu.org>
parents: 33645
diff changeset
4632 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
4633 {
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4634 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
4635 return 0;
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
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4638 return 1;
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4639 }
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4640
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4641
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4642 /* 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
4643 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
4644
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4645 static int
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4646 mmap_enlarge (r, npages)
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4647 struct mmap_region *r;
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4648 int npages;
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4649 {
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4650 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
4651 size_t nbytes;
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4652 int success = 0;
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 if (npages < 0)
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4655 {
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4656 /* 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
4657 nbytes = - npages * mmap_page_size;
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4658 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
4659 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
4660 else
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4661 {
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4662 r->nbytes_mapped -= nbytes;
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4663 success = 1;
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4664 }
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4665 }
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4666 else if (npages > 0)
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 nbytes = npages * mmap_page_size;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49444
diff changeset
4669
31604
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4670 /* 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
4671 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
4672 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
4673 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
4674 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
4675 {
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4676 POINTER_TYPE *p;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49444
diff changeset
4677
31604
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4678 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
4679 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
4680 if (p == MAP_FAILED)
33598
d2ed1317ec06 (mmap_enlarge): Don't print a message on stderr
Gerd Moellmann <gerd@gnu.org>
parents: 32856
diff changeset
4681 ; /* 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
4682 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
4683 {
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4684 /* 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
4685 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
4686 no use for it. */
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4687 if (munmap (p, nbytes) == -1)
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4688 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
4689 }
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4690 else
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4691 {
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4692 r->nbytes_mapped += nbytes;
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4693 success = 1;
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4694 }
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4695 }
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4696 }
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4697
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4698 return success;
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4699 }
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4700
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4701
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4702 /* 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
4703 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
4704 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
4705 of mapped regions.
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4706
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4707 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
4708 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
4709 when Emacs starts. */
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4710
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4711 void
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4712 mmap_set_vars (restore_p)
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4713 int restore_p;
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4714 {
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4715 struct mmap_region *r;
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 (restore_p)
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4718 {
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4719 mmap_regions = mmap_regions_1;
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4720 mmap_fd = mmap_fd_1;
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4721 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
4722 *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
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 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
4727 *r->var = NULL;
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4728 mmap_regions_1 = mmap_regions;
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4729 mmap_regions = NULL;
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4730 mmap_fd_1 = mmap_fd;
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4731 mmap_fd = -1;
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4732 }
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4733 }
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4734
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4735
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4736 /* 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
4737 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
4738 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
4739
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4740 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
4741
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4742 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
4743 return null. */
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 static POINTER_TYPE *
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4746 mmap_alloc (var, nbytes)
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4747 POINTER_TYPE **var;
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4748 size_t nbytes;
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4749 {
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4750 void *p;
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4751 size_t map;
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 mmap_init ();
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4754
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4755 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
4756 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
4757 mmap_fd, 0);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49444
diff changeset
4758
31604
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4759 if (p == MAP_FAILED)
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4760 {
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4761 if (errno != ENOMEM)
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4762 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
4763 p = NULL;
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4764 }
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4765 else
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4766 {
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4767 struct mmap_region *r = (struct mmap_region *) p;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49444
diff changeset
4768
31604
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4769 r->nbytes_specified = nbytes;
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4770 r->nbytes_mapped = map;
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4771 r->var = var;
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4772 r->prev = NULL;
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4773 r->next = mmap_regions;
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4774 if (r->next)
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4775 r->next->prev = r;
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4776 mmap_regions = r;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49444
diff changeset
4777
31604
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4778 p = MMAP_USER_AREA (p);
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4779 }
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49444
diff changeset
4780
31604
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4781 return *var = p;
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4782 }
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4783
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4784
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4785 /* 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
4786 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
4787 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
4788 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
4789
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4790 static POINTER_TYPE *
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4791 mmap_realloc (var, nbytes)
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4792 POINTER_TYPE **var;
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4793 size_t nbytes;
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 POINTER_TYPE *result;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49444
diff changeset
4796
31604
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4797 mmap_init ();
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4798
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4799 if (*var == NULL)
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4800 result = mmap_alloc (var, nbytes);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49444
diff changeset
4801 else if (nbytes == 0)
31604
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 mmap_free (var);
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4804 result = mmap_alloc (var, nbytes);
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4805 }
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4806 else
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 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
4809 size_t room = r->nbytes_mapped - MMAP_REGION_STRUCT_SIZE;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49444
diff changeset
4810
31604
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4811 if (room < nbytes)
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 /* Must enlarge. */
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4814 POINTER_TYPE *old_ptr = *var;
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4815
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4816 /* 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
4817 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
4818 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
4819 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
4820 / mmap_page_size)))
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4821 {
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4822 r->nbytes_specified = nbytes;
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4823 *var = result = old_ptr;
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 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
4826 {
109165
750db9f3e6d8 Replace bcopy, bzero, bcmp by memcpy, memmove, memset, memcmp
Andreas Schwab <schwab@linux-m68k.org>
parents: 109144
diff changeset
4827 memcpy (*var, old_ptr, r->nbytes_specified);
31604
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4828 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
4829 result = *var;
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4830 r = MMAP_REGION (result);
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4831 r->nbytes_specified = nbytes;
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 else
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4834 {
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4835 *var = old_ptr;
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4836 result = NULL;
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4837 }
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4838 }
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4839 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
4840 {
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4841 /* Shrinking by at least a page. Let's give some
46588
c725edd73e4c comment last change
Ken Raeburn <raeburn@raeburn.org>
parents: 46585
diff changeset
4842 memory back to the system.
c725edd73e4c comment last change
Ken Raeburn <raeburn@raeburn.org>
parents: 46585
diff changeset
4843
c725edd73e4c comment last change
Ken Raeburn <raeburn@raeburn.org>
parents: 46585
diff changeset
4844 The extra parens are to make the division happens first,
c725edd73e4c comment last change
Ken Raeburn <raeburn@raeburn.org>
parents: 46585
diff changeset
4845 on positive values, so we know it will round towards
c725edd73e4c comment last change
Ken Raeburn <raeburn@raeburn.org>
parents: 46585
diff changeset
4846 zero. */
46585
8d0730b0e14c (mmap_realloc): When shrinking, make sure number of
Ken Raeburn <raeburn@raeburn.org>
parents: 46445
diff changeset
4847 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
4848 result = *var;
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4849 r->nbytes_specified = nbytes;
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4850 }
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4851 else
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4852 {
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4853 /* Leave it alone. */
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4854 result = *var;
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4855 r->nbytes_specified = nbytes;
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4856 }
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4857 }
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4858
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4859 return result;
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4860 }
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4861
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4862
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4863 /* 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
4864 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
4865
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4866 static void
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4867 mmap_free (var)
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4868 POINTER_TYPE **var;
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4869 {
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4870 mmap_init ();
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49444
diff changeset
4871
31604
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4872 if (*var)
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4873 {
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4874 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
4875 *var = NULL;
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4876 }
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4877 }
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4878
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4879
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4880 /* 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
4881
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4882 static void
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4883 mmap_init ()
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4884 {
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4885 #if MAP_ANON == 0
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4886 /* 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
4887 in a dumped Emacs. */
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4888 if (mmap_fd <= 0)
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4889 {
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4890 /* 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
4891 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
4892 if (mmap_fd == -1)
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4893 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
4894 }
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4895 #endif /* MAP_ANON == 0 */
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4896
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4897 if (mmap_initialized_p)
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4898 return;
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4899 mmap_initialized_p = 1;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49444
diff changeset
4900
31604
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4901 #if MAP_ANON != 0
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4902 mmap_fd = -1;
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4903 #endif
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49444
diff changeset
4904
31604
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4905 mmap_page_size = getpagesize ();
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4906 }
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4907
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4908 #endif /* USE_MMAP_FOR_BUFFERS */
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4909
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4910
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4911
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4912 /***********************************************************************
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4913 Buffer-text Allocation
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4914 ***********************************************************************/
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4915
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4916 #ifdef REL_ALLOC
109100
2bc9a0c04c87 Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents: 108890
diff changeset
4917 extern POINTER_TYPE *r_alloc (POINTER_TYPE **, size_t);
2bc9a0c04c87 Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents: 108890
diff changeset
4918 extern POINTER_TYPE *r_re_alloc (POINTER_TYPE **, size_t);
2bc9a0c04c87 Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents: 108890
diff changeset
4919 extern void r_alloc_free (POINTER_TYPE **ptr);
31604
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4920 #endif /* REL_ALLOC */
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 /* 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
4924
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4925 static void
109144
7dceae91724c Convert most remaining function definitions to standard C.
Juanma Barranquero <lekktu@gmail.com>
parents: 109100
diff changeset
4926 alloc_buffer_text (struct buffer *b, size_t nbytes)
31604
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4927 {
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4928 POINTER_TYPE *p;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49444
diff changeset
4929
31604
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4930 BLOCK_INPUT;
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4931 #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
4932 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
4933 #elif defined REL_ALLOC
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4934 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
4935 #else
31612
2050f93e8cef (alloc_buffer_text): Fix xmalloc call.
Dave Love <fx@gnu.org>
parents: 31604
diff changeset
4936 p = xmalloc (nbytes);
31604
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4937 #endif
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49444
diff changeset
4938
31604
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4939 if (p == NULL)
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4940 {
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4941 UNBLOCK_INPUT;
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4942 memory_full ();
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4943 }
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4944
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4945 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
4946 UNBLOCK_INPUT;
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4947 }
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4948
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4949 /* 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
4950 shrink it. */
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4951
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4952 void
93117
87f463ae1530 (enlarge_buffer_text): Fix int -> EMACS_INT.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92975
diff changeset
4953 enlarge_buffer_text (struct buffer *b, EMACS_INT delta)
31604
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4954 {
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4955 POINTER_TYPE *p;
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4956 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
4957 + delta);
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4958 BLOCK_INPUT;
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4959 #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
4960 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
4961 #elif defined REL_ALLOC
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4962 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
4963 #else
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4964 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
4965 #endif
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49444
diff changeset
4966
31604
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4967 if (p == NULL)
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4968 {
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4969 UNBLOCK_INPUT;
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4970 memory_full ();
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4971 }
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4972
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4973 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
4974 UNBLOCK_INPUT;
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4975 }
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4976
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4977
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4978 /* 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
4979
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4980 static void
109144
7dceae91724c Convert most remaining function definitions to standard C.
Juanma Barranquero <lekktu@gmail.com>
parents: 109100
diff changeset
4981 free_buffer_text (struct buffer *b)
31604
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4982 {
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4983 BLOCK_INPUT;
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4984
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4985 #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
4986 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
4987 #elif defined REL_ALLOC
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4988 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
4989 #else
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4990 xfree (b->text->beg);
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4991 #endif
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49444
diff changeset
4992
31604
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4993 BUF_BEG_ADDR (b) = NULL;
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4994 UNBLOCK_INPUT;
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4995 }
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4996
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4997
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4998
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
4999 /***********************************************************************
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
5000 Initialization
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
5001 ***********************************************************************/
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
5002
21514
fa9ff387d260 Fix -Wimplicit warnings.
Andreas Schwab <schwab@suse.de>
parents: 21506
diff changeset
5003 void
109144
7dceae91724c Convert most remaining function definitions to standard C.
Juanma Barranquero <lekktu@gmail.com>
parents: 109100
diff changeset
5004 init_buffer_once (void)
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5005 {
28314
c46e609d887a (buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents: 28207
diff changeset
5006 int idx;
c46e609d887a (buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents: 28207
diff changeset
5007
109165
750db9f3e6d8 Replace bcopy, bzero, bcmp by memcpy, memmove, memset, memcmp
Andreas Schwab <schwab@linux-m68k.org>
parents: 109144
diff changeset
5008 memset (buffer_permanent_local_flags, 0, sizeof buffer_permanent_local_flags);
15776
6018e01d4466 (buffer_permanent_local_flags): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 15638
diff changeset
5009
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5010 /* Make sure all markable slots in buffer_defaults
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5011 are initialized reasonably, so mark_buffer won't choke. */
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5012 reset_buffer (&buffer_defaults);
107984
bef5d1738c0b Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 107845
diff changeset
5013 eassert (EQ (buffer_defaults.name, make_number (0)));
15776
6018e01d4466 (buffer_permanent_local_flags): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 15638
diff changeset
5014 reset_buffer_local_variables (&buffer_defaults, 1);
107984
bef5d1738c0b Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 107845
diff changeset
5015 eassert (EQ (buffer_local_symbols.name, make_number (0)));
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5016 reset_buffer (&buffer_local_symbols);
15776
6018e01d4466 (buffer_permanent_local_flags): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 15638
diff changeset
5017 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
5018 /* Prevent GC from getting confused. */
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
5019 buffer_defaults.text = &buffer_defaults.own_text;
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
5020 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
5021 BUF_INTERVALS (&buffer_defaults) = 0;
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
5022 BUF_INTERVALS (&buffer_local_symbols) = 0;
85018
3389713480bb (Fget_buffer_create, init_buffer_once): Use XSETPVECTYPE.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 85011
diff changeset
5023 XSETPVECTYPE (&buffer_defaults, PVEC_BUFFER);
9262
582534b6e763 (Fget_buffer_create, Frename_buffer, Fbuffer_disable_undo,
Karl Heuer <kwzh@gnu.org>
parents: 9211
diff changeset
5024 XSETBUFFER (Vbuffer_defaults, &buffer_defaults);
85018
3389713480bb (Fget_buffer_create, init_buffer_once): Use XSETPVECTYPE.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 85011
diff changeset
5025 XSETPVECTYPE (&buffer_local_symbols, PVEC_BUFFER);
9262
582534b6e763 (Fget_buffer_create, Frename_buffer, Fbuffer_disable_undo,
Karl Heuer <kwzh@gnu.org>
parents: 9211
diff changeset
5026 XSETBUFFER (Vbuffer_local_symbols, &buffer_local_symbols);
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5027
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5028 /* Set up the default values of various buffer slots. */
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5029 /* Must do these before making the first buffer! */
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5030
28636
19c81f320db5 (Fmake_indirect_buffer): Escape newline in doc.
Dave Love <fx@gnu.org>
parents: 28625
diff changeset
5031 /* real setup is done in bindings.el */
105877
21bdda3ded62 * xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105669
diff changeset
5032 buffer_defaults.mode_line_format = make_pure_c_string ("%-");
25546
Gerd Moellmann <gerd@gnu.org>
parents: 25508
diff changeset
5033 buffer_defaults.header_line_format = Qnil;
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5034 buffer_defaults.abbrev_mode = Qnil;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5035 buffer_defaults.overwrite_mode = Qnil;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5036 buffer_defaults.case_fold_search = Qt;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5037 buffer_defaults.auto_fill_function = Qnil;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5038 buffer_defaults.selective_display = Qnil;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5039 #ifndef old
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5040 buffer_defaults.selective_display_ellipses = Qt;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5041 #endif
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5042 buffer_defaults.abbrev_table = Qnil;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5043 buffer_defaults.display_table = Qnil;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5044 buffer_defaults.undo_list = Qnil;
2043
a1ab3501653c (reset_buffer_local_variables): Reset mark_active.
Richard M. Stallman <rms@gnu.org>
parents: 2020
diff changeset
5045 buffer_defaults.mark_active = Qnil;
11052
35664a2851e7 (reset_buffer): Reset file_format element too.(init_buffer_once): Define file_format flag; reset file_format.
Boris Goldowsky <boris@gnu.org>
parents: 11000
diff changeset
5046 buffer_defaults.file_format = Qnil;
56976
b3aa8cb4c381 (reset_buffer, init_buffer_once): Handle auto_save_file_format field.
Luc Teirlinck <teirllm@auburn.edu>
parents: 56669
diff changeset
5047 buffer_defaults.auto_save_file_format = Qt;
51844
c5036e7cc93b (overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51827
diff changeset
5048 buffer_defaults.overlays_before = NULL;
c5036e7cc93b (overlay_strings, recenter_overlay_lists): Fix typo in eassert in last commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51827
diff changeset
5049 buffer_defaults.overlays_after = NULL;
51824
9f5665eb77bd (reset_buffer, recenter_overlay_lists)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51782
diff changeset
5050 buffer_defaults.overlay_center = BEG;
9296
a1a7fc21ded9 (reset_buffer, Ferase_buffer, validate_region, list_buffers_1, recenter_overlay_lists, init_buffer_once): Don't use XFASTINT as an lvalue.
Karl Heuer <kwzh@gnu.org>
parents: 9262
diff changeset
5051
a1a7fc21ded9 (reset_buffer, Ferase_buffer, validate_region, list_buffers_1, recenter_overlay_lists, init_buffer_once): Don't use XFASTINT as an lvalue.
Karl Heuer <kwzh@gnu.org>
parents: 9262
diff changeset
5052 XSETFASTINT (buffer_defaults.tab_width, 8);
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5053 buffer_defaults.truncate_lines = Qnil;
96233
514e5b8b3fbf (syms_of_buffer): New variables default-word-wrap and word-wrap.
Chong Yidong <cyd@stupidchicken.com>
parents: 95826
diff changeset
5054 buffer_defaults.word_wrap = Qnil;
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5055 buffer_defaults.ctl_arrow = Qt;
107584
e0df0337f248 Retrospective commit from 2009-08-15.
Eli Zaretskii <eliz@gnu.org>
parents: 107583
diff changeset
5056 buffer_defaults.bidi_display_reordering = Qnil;
107602
d44bdcba4457 Retrospective commit from 2009-11-14.
Eli Zaretskii <eliz@gnu.org>
parents: 107596
diff changeset
5057 buffer_defaults.bidi_paragraph_direction = Qnil;
28322
986882bafaf1 (reset_buffer): Initialize buffer's cursor_type.
Gerd Moellmann <gerd@gnu.org>
parents: 28314
diff changeset
5058 buffer_defaults.cursor_type = Qt;
28688
3c44b2f54f82 (init_buffer_once): Handle extra_line_spacing.
Gerd Moellmann <gerd@gnu.org>
parents: 28636
diff changeset
5059 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
5060 buffer_defaults.cursor_in_non_selected_windows = Qt;
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5061
9785
a72386110d83 (init_buffer): Use DIRECTORY_SEP, IS_DIRECTORY_SEP macros,
Richard M. Stallman <rms@gnu.org>
parents: 9732
diff changeset
5062 #ifdef DOS_NT
7270
0f79f4bd3c62 (init_buffer_once): Initialize buffer_file_type field right.
Richard M. Stallman <rms@gnu.org>
parents: 7062
diff changeset
5063 buffer_defaults.buffer_file_type = Qnil; /* TEXT */
5502
2b48fd9bc80e [MSDOS]: New buffer-local variable:
Richard M. Stallman <rms@gnu.org>
parents: 5433
diff changeset
5064 #endif
17124
fdad8ea24563 (init_buffer_once): Make member
Kenichi Handa <handa@m17n.org>
parents: 17022
diff changeset
5065 buffer_defaults.enable_multibyte_characters = Qt;
18178
b45b431879bf (init_buffer_once): Inititialize the member
Kenichi Handa <handa@m17n.org>
parents: 18105
diff changeset
5066 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
5067 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
5068 XSETFASTINT (buffer_defaults.left_margin, 0);
9403
9f797989b817 * buffer.c: #include region-cache.h.
Jim Blandy <jimb@redhat.com>
parents: 9362
diff changeset
5069 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
5070 buffer_defaults.file_truename = Qnil;
17218
a57ca25e9c62 (reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents: 17124
diff changeset
5071 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
5072 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
5073 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
5074 buffer_defaults.left_fringe_width = Qnil;
17af4bfeb062 (init_buffer_once): Set buffer_defaults and
Kim F. Storm <storm@cua.dk>
parents: 51166
diff changeset
5075 buffer_defaults.right_fringe_width = Qnil;
17af4bfeb062 (init_buffer_once): Set buffer_defaults and
Kim F. Storm <storm@cua.dk>
parents: 51166
diff changeset
5076 buffer_defaults.fringes_outside_margins = Qnil;
17af4bfeb062 (init_buffer_once): Set buffer_defaults and
Kim F. Storm <storm@cua.dk>
parents: 51166
diff changeset
5077 buffer_defaults.scroll_bar_width = Qnil;
17af4bfeb062 (init_buffer_once): Set buffer_defaults and
Kim F. Storm <storm@cua.dk>
parents: 51166
diff changeset
5078 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
5079 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
5080 buffer_defaults.indicate_buffer_boundaries = Qnil;
69047
7e64cebb0463 (init_buffer_once): Set dummy default values for
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
5081 buffer_defaults.fringe_indicator_alist = Qnil;
7e64cebb0463 (init_buffer_once): Set dummy default values for
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
5082 buffer_defaults.fringe_cursor_alist = Qnil;
25021
7a31786a0335 (init_buffer_once): Init top_line_format.
Gerd Moellmann <gerd@gnu.org>
parents: 24975
diff changeset
5083 buffer_defaults.scroll_up_aggressively = Qnil;
7a31786a0335 (init_buffer_once): Init top_line_format.
Gerd Moellmann <gerd@gnu.org>
parents: 24975
diff changeset
5084 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
5085 buffer_defaults.display_time = Qnil;
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5086
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5087 /* Assign the local-flags to the slots that have default values.
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5088 The local flag is a bit that is used in the buffer
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5089 to say that it has its own local value for the slot.
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5090 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
5091
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5092 /* 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
5093 if (sizeof (EMACS_INT) != sizeof (Lisp_Object)) abort ();
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5094
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5095 /* 0 means not a lisp var, -1 means always local, else mask */
109165
750db9f3e6d8 Replace bcopy, bzero, bcmp by memcpy, memmove, memset, memcmp
Andreas Schwab <schwab@linux-m68k.org>
parents: 109144
diff changeset
5096 memset (&buffer_local_flags, 0, sizeof buffer_local_flags);
9362
f6dc29e7e986 (init_buffer_once): Don't use XSETFASTINT when negative.
Karl Heuer <kwzh@gnu.org>
parents: 9335
diff changeset
5097 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
5098 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
5099 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
5100 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
5101 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
5102 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
5103 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
5104 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
5105 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
5106 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
5107 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
5108 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
5109 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
5110 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
5111 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
5112 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
5113 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
5114 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
5115
28314
c46e609d887a (buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents: 28207
diff changeset
5116 idx = 1;
c46e609d887a (buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents: 28207
diff changeset
5117 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
5118 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
5119 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
5120 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
5121 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
5122 XSETFASTINT (buffer_local_flags.selective_display, idx); ++idx;
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5123 #ifndef old
28314
c46e609d887a (buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents: 28207
diff changeset
5124 XSETFASTINT (buffer_local_flags.selective_display_ellipses, idx); ++idx;
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5125 #endif
28314
c46e609d887a (buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents: 28207
diff changeset
5126 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
5127 XSETFASTINT (buffer_local_flags.truncate_lines, idx); ++idx;
96233
514e5b8b3fbf (syms_of_buffer): New variables default-word-wrap and word-wrap.
Chong Yidong <cyd@stupidchicken.com>
parents: 95826
diff changeset
5128 XSETFASTINT (buffer_local_flags.word_wrap, idx); ++idx;
28314
c46e609d887a (buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents: 28207
diff changeset
5129 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
5130 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
5131 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
5132 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
5133 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
5134 #ifdef DOS_NT
28314
c46e609d887a (buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents: 28207
diff changeset
5135 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
5136 /* 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
5137 buffer_permanent_local_flags[idx++] = 1;
5502
2b48fd9bc80e [MSDOS]: New buffer-local variable:
Richard M. Stallman <rms@gnu.org>
parents: 5433
diff changeset
5138 #endif
28314
c46e609d887a (buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents: 28207
diff changeset
5139 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
5140 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
5141 XSETFASTINT (buffer_local_flags.category_table, idx); ++idx;
107584
e0df0337f248 Retrospective commit from 2009-08-15.
Eli Zaretskii <eliz@gnu.org>
parents: 107583
diff changeset
5142 XSETFASTINT (buffer_local_flags.bidi_display_reordering, idx); ++idx;
107602
d44bdcba4457 Retrospective commit from 2009-11-14.
Eli Zaretskii <eliz@gnu.org>
parents: 107596
diff changeset
5143 XSETFASTINT (buffer_local_flags.bidi_paragraph_direction, idx); ++idx;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49444
diff changeset
5144 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
5145 /* 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
5146 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
5147 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
5148 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
5149 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
5150 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
5151 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
5152 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
5153 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
5154 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
5155 XSETFASTINT (buffer_local_flags.indicate_buffer_boundaries, idx); ++idx;
69047
7e64cebb0463 (init_buffer_once): Set dummy default values for
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
5156 XSETFASTINT (buffer_local_flags.fringe_indicator_alist, idx); ++idx;
7e64cebb0463 (init_buffer_once): Set dummy default values for
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
5157 XSETFASTINT (buffer_local_flags.fringe_cursor_alist, idx); ++idx;
28314
c46e609d887a (buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents: 28207
diff changeset
5158 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
5159 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
5160 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
5161 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
5162 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
5163 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
5164
c46e609d887a (buffer_permanent_local_flags): Make a char array.
Gerd Moellmann <gerd@gnu.org>
parents: 28207
diff changeset
5165 /* Need more room? */
28352
1555145f8c35 (buffer_permanent_local_flags): Use MAX_PER_BUFFER_VARS
Gerd Moellmann <gerd@gnu.org>
parents: 28332
diff changeset
5166 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
5167 abort ();
28352
1555145f8c35 (buffer_permanent_local_flags): Use MAX_PER_BUFFER_VARS
Gerd Moellmann <gerd@gnu.org>
parents: 28332
diff changeset
5168 last_per_buffer_idx = idx;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49444
diff changeset
5169
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5170 Vbuffer_alist = Qnil;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5171 current_buffer = 0;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5172 all_buffers = 0;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5173
105958
341a779db1d0 * frame.c (make_initial_frame):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105885
diff changeset
5174 QSFundamental = make_pure_c_string ("Fundamental");
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5175
105877
21bdda3ded62 * xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105669
diff changeset
5176 Qfundamental_mode = intern_c_string ("fundamental-mode");
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5177 buffer_defaults.major_mode = Qfundamental_mode;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5178
105877
21bdda3ded62 * xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105669
diff changeset
5179 Qmode_class = intern_c_string ("mode-class");
21bdda3ded62 * xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105669
diff changeset
5180
21bdda3ded62 * xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105669
diff changeset
5181 Qprotected_field = intern_c_string ("protected-field");
21bdda3ded62 * xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105669
diff changeset
5182
21bdda3ded62 * xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105669
diff changeset
5183 Qpermanent_local = intern_c_string ("permanent-local");
21bdda3ded62 * xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105669
diff changeset
5184
21bdda3ded62 * xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105669
diff changeset
5185 Qkill_buffer_hook = intern_c_string ("kill-buffer-hook");
51431
5fc6a7035dd3 (init_buffer_once): Make kill-buffer-hook permanent-local.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51394
diff changeset
5186 Fput (Qkill_buffer_hook, Qpermanent_local, Qt);
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5187
105877
21bdda3ded62 * xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105669
diff changeset
5188 Qucs_set_table_for_input = intern_c_string ("ucs-set-table-for-input");
48635
2a9a1d761581 (Qucs_set_table_for_input): New.
Dave Love <fx@gnu.org>
parents: 48355
diff changeset
5189
102619
f40356cf5650 Move comment to make clearer it's talking about buffer Vprin1_to_string_buffer.
Juanma Barranquero <lekktu@gmail.com>
parents: 102466
diff changeset
5190 /* super-magic invisible buffer */
105877
21bdda3ded62 * xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105669
diff changeset
5191 Vprin1_to_string_buffer = Fget_buffer_create (make_pure_c_string (" prin1"));
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5192 Vbuffer_alist = Qnil;
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5193
105877
21bdda3ded62 * xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105669
diff changeset
5194 Fset_buffer (Fget_buffer_create (make_pure_c_string ("*scratch*")));
23399
e80c5f687340 (inhibit_modification_hooks): New variable.
Kenichi Handa <handa@m17n.org>
parents: 23174
diff changeset
5195
e80c5f687340 (inhibit_modification_hooks): New variable.
Kenichi Handa <handa@m17n.org>
parents: 23174
diff changeset
5196 inhibit_modification_hooks = 0;
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5197 }
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5198
21514
fa9ff387d260 Fix -Wimplicit warnings.
Andreas Schwab <schwab@suse.de>
parents: 21506
diff changeset
5199 void
109144
7dceae91724c Convert most remaining function definitions to standard C.
Juanma Barranquero <lekktu@gmail.com>
parents: 109100
diff changeset
5200 init_buffer (void)
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5201 {
1563
e721339972b0 * buffer.c (init_buffer): If PWD is accurate, use it instead of
Jim Blandy <jimb@redhat.com>
parents: 1501
diff changeset
5202 char *pwd;
3463
aa78c7babb8e (init_buffer): Init default-directory of minibuffer.
Richard M. Stallman <rms@gnu.org>
parents: 3329
diff changeset
5203 Lisp_Object temp;
66043
7e251d472f1c (init_buffer): Rename `rc' to `len' for clarity.
Romain Francoise <romain@orebokech.com>
parents: 65439
diff changeset
5204 int len;
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5205
31604
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
5206 #ifdef USE_MMAP_FOR_BUFFERS
31412
828b2b8afdc0 (init_buffer) [REL_ALLOC_MMAP]: Map new buffer
Gerd Moellmann <gerd@gnu.org>
parents: 31395
diff changeset
5207 {
828b2b8afdc0 (init_buffer) [REL_ALLOC_MMAP]: Map new buffer
Gerd Moellmann <gerd@gnu.org>
parents: 31395
diff changeset
5208 /* 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
5209 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
5210 Map new memory. */
828b2b8afdc0 (init_buffer) [REL_ALLOC_MMAP]: Map new buffer
Gerd Moellmann <gerd@gnu.org>
parents: 31395
diff changeset
5211 struct buffer *b;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49444
diff changeset
5212
31412
828b2b8afdc0 (init_buffer) [REL_ALLOC_MMAP]: Map new buffer
Gerd Moellmann <gerd@gnu.org>
parents: 31395
diff changeset
5213 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
5214 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
5215 enlarge_buffer_text (b, 0);
31412
828b2b8afdc0 (init_buffer) [REL_ALLOC_MMAP]: Map new buffer
Gerd Moellmann <gerd@gnu.org>
parents: 31395
diff changeset
5216 }
31604
91e7cea32eaa Move allocation with mmap here, from ralloc.c. Change
Gerd Moellmann <gerd@gnu.org>
parents: 31416
diff changeset
5217 #endif /* USE_MMAP_FOR_BUFFERS */
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49444
diff changeset
5218
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5219 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
5220 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
5221 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
5222
65411
29cca0143d6f (init_buffer): Use get_current_dir_name.
Eli Zaretskii <eliz@gnu.org>
parents: 64770
diff changeset
5223 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
5224
65438
170f43effa81 (init_buffer): Grow buffer to add directory separator
Romain Francoise <romain@orebokech.com>
parents: 65422
diff changeset
5225 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
5226 fatal ("`get_current_dir_name' failed: %s\n", strerror (errno));
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5227
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5228 /* Maybe this should really use some standard subroutine
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5229 whose definition is filename syntax dependent. */
66043
7e251d472f1c (init_buffer): Rename `rc' to `len' for clarity.
Romain Francoise <romain@orebokech.com>
parents: 65439
diff changeset
5230 len = strlen (pwd);
7e251d472f1c (init_buffer): Rename `rc' to `len' for clarity.
Romain Francoise <romain@orebokech.com>
parents: 65439
diff changeset
5231 if (!(IS_DIRECTORY_SEP (pwd[len - 1])))
9785
a72386110d83 (init_buffer): Use DIRECTORY_SEP, IS_DIRECTORY_SEP macros,
Richard M. Stallman <rms@gnu.org>
parents: 9732
diff changeset
5232 {
65438
170f43effa81 (init_buffer): Grow buffer to add directory separator
Romain Francoise <romain@orebokech.com>
parents: 65422
diff changeset
5233 /* Grow buffer to add directory separator and '\0'. */
100633
5395c014feb8 * buffer.c (init_buffer): Use realloc instead of xrealloc.
Andreas Schwab <schwab@suse.de>
parents: 100295
diff changeset
5234 pwd = (char *) realloc (pwd, len + 2);
5395c014feb8 * buffer.c (init_buffer): Use realloc instead of xrealloc.
Andreas Schwab <schwab@suse.de>
parents: 100295
diff changeset
5235 if (!pwd)
5395c014feb8 * buffer.c (init_buffer): Use realloc instead of xrealloc.
Andreas Schwab <schwab@suse.de>
parents: 100295
diff changeset
5236 fatal ("`get_current_dir_name' failed: %s\n", strerror (errno));
66043
7e251d472f1c (init_buffer): Rename `rc' to `len' for clarity.
Romain Francoise <romain@orebokech.com>
parents: 65439
diff changeset
5237 pwd[len] = DIRECTORY_SEP;
7e251d472f1c (init_buffer): Rename `rc' to `len' for clarity.
Romain Francoise <romain@orebokech.com>
parents: 65439
diff changeset
5238 pwd[len + 1] = '\0';
9785
a72386110d83 (init_buffer): Use DIRECTORY_SEP, IS_DIRECTORY_SEP macros,
Richard M. Stallman <rms@gnu.org>
parents: 9732
diff changeset
5239 }
16384
4ec13b05b0fa (init_buffer): Add /: to dir names that could be magic.
Richard M. Stallman <rms@gnu.org>
parents: 16370
diff changeset
5240
65411
29cca0143d6f (init_buffer): Use get_current_dir_name.
Eli Zaretskii <eliz@gnu.org>
parents: 64770
diff changeset
5241 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
5242 if (! NILP (buffer_defaults.enable_multibyte_characters))
65439
1ffe6d4d0fc4 (init_buffer): Fix typos.
Romain Francoise <romain@orebokech.com>
parents: 65438
diff changeset
5243 /* 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
5244 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
5245 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
5246 current_buffer->directory
567ca4ca8574 (init_buffer): Set current_buffer->directory to a
Kenichi Handa <handa@m17n.org>
parents: 58501
diff changeset
5247 = 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
5248
16384
4ec13b05b0fa (init_buffer): Add /: to dir names that could be magic.
Richard M. Stallman <rms@gnu.org>
parents: 16370
diff changeset
5249 /* 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
5250 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
5251 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
5252 if (! NILP (temp)
52fbf5fad62e (init_buffer): Don't add /: to default dir if it's `/'.
Karl Heuer <kwzh@gnu.org>
parents: 19977
diff changeset
5253 /* 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
5254 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
5255 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
5256 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
5257 && 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
5258 current_buffer->directory
4ec13b05b0fa (init_buffer): Add /: to dir names that could be magic.
Richard M. Stallman <rms@gnu.org>
parents: 16370
diff changeset
5259 = 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
5260
3463
aa78c7babb8e (init_buffer): Init default-directory of minibuffer.
Richard M. Stallman <rms@gnu.org>
parents: 3329
diff changeset
5261 temp = get_minibuffer (0);
aa78c7babb8e (init_buffer): Init default-directory of minibuffer.
Richard M. Stallman <rms@gnu.org>
parents: 3329
diff changeset
5262 XBUFFER (temp)->directory = current_buffer->directory;
65411
29cca0143d6f (init_buffer): Use get_current_dir_name.
Eli Zaretskii <eliz@gnu.org>
parents: 64770
diff changeset
5263
29cca0143d6f (init_buffer): Use get_current_dir_name.
Eli Zaretskii <eliz@gnu.org>
parents: 64770
diff changeset
5264 free (pwd);
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5265 }
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5266
85011
1d35aa875508 * buffer.c (syms_of_buffer) <local-abbrev-table>: Move from abbrev.c.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 83648
diff changeset
5267 /* Similar to defvar_lisp but define a variable whose value is the Lisp
1d35aa875508 * buffer.c (syms_of_buffer) <local-abbrev-table>: Move from abbrev.c.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 83648
diff changeset
5268 Object stored in the current buffer. address is the address of the slot
1d35aa875508 * buffer.c (syms_of_buffer) <local-abbrev-table>: Move from abbrev.c.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 83648
diff changeset
5269 in the buffer that is current now. */
1d35aa875508 * buffer.c (syms_of_buffer) <local-abbrev-table>: Move from abbrev.c.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 83648
diff changeset
5270
1d35aa875508 * buffer.c (syms_of_buffer) <local-abbrev-table>: Move from abbrev.c.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 83648
diff changeset
5271 /* TYPE is nil for a general Lisp variable.
107984
bef5d1738c0b Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 107845
diff changeset
5272 An integer specifies a type; then only Lisp values
85011
1d35aa875508 * buffer.c (syms_of_buffer) <local-abbrev-table>: Move from abbrev.c.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 83648
diff changeset
5273 with that type code are allowed (except that nil is allowed too).
107984
bef5d1738c0b Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 107845
diff changeset
5274 LNAME is the Lisp-level variable name.
85011
1d35aa875508 * buffer.c (syms_of_buffer) <local-abbrev-table>: Move from abbrev.c.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 83648
diff changeset
5275 VNAME is the name of the buffer slot.
1d35aa875508 * buffer.c (syms_of_buffer) <local-abbrev-table>: Move from abbrev.c.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 83648
diff changeset
5276 DOC is a dummy where you write the doc string as a comment. */
107984
bef5d1738c0b Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 107845
diff changeset
5277 #define DEFVAR_PER_BUFFER(lname, vname, type, doc) \
bef5d1738c0b Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 107845
diff changeset
5278 do { \
bef5d1738c0b Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 107845
diff changeset
5279 static struct Lisp_Buffer_Objfwd bo_fwd; \
bef5d1738c0b Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 107845
diff changeset
5280 defvar_per_buffer (&bo_fwd, lname, vname, type, 0); \
bef5d1738c0b Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 107845
diff changeset
5281 } while (0)
85011
1d35aa875508 * buffer.c (syms_of_buffer) <local-abbrev-table>: Move from abbrev.c.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 83648
diff changeset
5282
1d35aa875508 * buffer.c (syms_of_buffer) <local-abbrev-table>: Move from abbrev.c.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 83648
diff changeset
5283 static void
109726
64732fa6188a Use const char* instead of char*.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109673
diff changeset
5284 defvar_per_buffer (struct Lisp_Buffer_Objfwd *bo_fwd, const char *namestring,
109144
7dceae91724c Convert most remaining function definitions to standard C.
Juanma Barranquero <lekktu@gmail.com>
parents: 109100
diff changeset
5285 Lisp_Object *address, Lisp_Object type, char *doc)
85011
1d35aa875508 * buffer.c (syms_of_buffer) <local-abbrev-table>: Move from abbrev.c.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 83648
diff changeset
5286 {
107984
bef5d1738c0b Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 107845
diff changeset
5287 struct Lisp_Symbol *sym;
85011
1d35aa875508 * buffer.c (syms_of_buffer) <local-abbrev-table>: Move from abbrev.c.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 83648
diff changeset
5288 int offset;
1d35aa875508 * buffer.c (syms_of_buffer) <local-abbrev-table>: Move from abbrev.c.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 83648
diff changeset
5289
107984
bef5d1738c0b Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 107845
diff changeset
5290 sym = XSYMBOL (intern (namestring));
85011
1d35aa875508 * buffer.c (syms_of_buffer) <local-abbrev-table>: Move from abbrev.c.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 83648
diff changeset
5291 offset = (char *)address - (char *)current_buffer;
1d35aa875508 * buffer.c (syms_of_buffer) <local-abbrev-table>: Move from abbrev.c.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 83648
diff changeset
5292
107984
bef5d1738c0b Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 107845
diff changeset
5293 bo_fwd->type = Lisp_Fwd_Buffer_Obj;
bef5d1738c0b Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 107845
diff changeset
5294 bo_fwd->offset = offset;
bef5d1738c0b Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 107845
diff changeset
5295 bo_fwd->slottype = type;
bef5d1738c0b Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 107845
diff changeset
5296 sym->redirect = SYMBOL_FORWARDED;
bef5d1738c0b Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 107845
diff changeset
5297 {
bef5d1738c0b Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 107845
diff changeset
5298 /* I tried to do the job without a cast, but it seems impossible.
bef5d1738c0b Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 107845
diff changeset
5299 union Lisp_Fwd *fwd; &(fwd->u_buffer_objfwd) = bo_fwd; */
bef5d1738c0b Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 107845
diff changeset
5300 SET_SYMBOL_FWD (sym, (union Lisp_Fwd *)bo_fwd);
bef5d1738c0b Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 107845
diff changeset
5301 }
bef5d1738c0b Make variable forwarding explicit rather the using special values.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 107845
diff changeset
5302 XSETSYMBOL (PER_BUFFER_SYMBOL (offset), sym);
85011
1d35aa875508 * buffer.c (syms_of_buffer) <local-abbrev-table>: Move from abbrev.c.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 83648
diff changeset
5303
1d35aa875508 * buffer.c (syms_of_buffer) <local-abbrev-table>: Move from abbrev.c.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 83648
diff changeset
5304 if (PER_BUFFER_IDX (offset) == 0)
1d35aa875508 * buffer.c (syms_of_buffer) <local-abbrev-table>: Move from abbrev.c.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 83648
diff changeset
5305 /* Did a DEFVAR_PER_BUFFER without initializing the corresponding
1d35aa875508 * buffer.c (syms_of_buffer) <local-abbrev-table>: Move from abbrev.c.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 83648
diff changeset
5306 slot of buffer_local_flags */
1d35aa875508 * buffer.c (syms_of_buffer) <local-abbrev-table>: Move from abbrev.c.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 83648
diff changeset
5307 abort ();
1d35aa875508 * buffer.c (syms_of_buffer) <local-abbrev-table>: Move from abbrev.c.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 83648
diff changeset
5308 }
1d35aa875508 * buffer.c (syms_of_buffer) <local-abbrev-table>: Move from abbrev.c.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 83648
diff changeset
5309
1d35aa875508 * buffer.c (syms_of_buffer) <local-abbrev-table>: Move from abbrev.c.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 83648
diff changeset
5310
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5311 /* initialize the buffer routines */
21514
fa9ff387d260 Fix -Wimplicit warnings.
Andreas Schwab <schwab@suse.de>
parents: 21506
diff changeset
5312 void
109144
7dceae91724c Convert most remaining function definitions to standard C.
Juanma Barranquero <lekktu@gmail.com>
parents: 109100
diff changeset
5313 syms_of_buffer (void)
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5314 {
12538
5920994b14c2 (last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 12488
diff changeset
5315 staticpro (&last_overlay_modification_hooks);
5920994b14c2 (last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 12488
diff changeset
5316 last_overlay_modification_hooks
5920994b14c2 (last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 12488
diff changeset
5317 = Fmake_vector (make_number (10), Qnil);
5920994b14c2 (last_overlay_modification_hooks): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 12488
diff changeset
5318
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5319 staticpro (&Vbuffer_defaults);
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5320 staticpro (&Vbuffer_local_symbols);
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5321 staticpro (&Qfundamental_mode);
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5322 staticpro (&Qmode_class);
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5323 staticpro (&QSFundamental);
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5324 staticpro (&Vbuffer_alist);
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5325 staticpro (&Qprotected_field);
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5326 staticpro (&Qpermanent_local);
105877
21bdda3ded62 * xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105669
diff changeset
5327 Qpermanent_local_hook = intern_c_string ("permanent-local-hook");
87977
0f04103be3bf (reset_buffer_local_variables): Implement `permanent-local-hook'.
Richard M. Stallman <rms@gnu.org>
parents: 87843
diff changeset
5328 staticpro (&Qpermanent_local_hook);
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5329 staticpro (&Qkill_buffer_hook);
105877
21bdda3ded62 * xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105669
diff changeset
5330 Qoverlayp = intern_c_string ("overlayp");
2776
8bf3bb4c20dd * lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents: 2722
diff changeset
5331 staticpro (&Qoverlayp);
105877
21bdda3ded62 * xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105669
diff changeset
5332 Qevaporate = intern_c_string ("evaporate");
8839
41981db9ad8e (Qevaporate): New symbol.
Karl Heuer <kwzh@gnu.org>
parents: 8818
diff changeset
5333 staticpro (&Qevaporate);
105877
21bdda3ded62 * xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105669
diff changeset
5334 Qmodification_hooks = intern_c_string ("modification-hooks");
4213
616036bb2427 (Qmodification_hooks, Qinsert_in_front_hooks)
Richard M. Stallman <rms@gnu.org>
parents: 4100
diff changeset
5335 staticpro (&Qmodification_hooks);
105877
21bdda3ded62 * xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105669
diff changeset
5336 Qinsert_in_front_hooks = intern_c_string ("insert-in-front-hooks");
12785
937df231678c (Qbefore_change_functions, Qafter_change_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 12699
diff changeset
5337 staticpro (&Qinsert_in_front_hooks);
105877
21bdda3ded62 * xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105669
diff changeset
5338 Qinsert_behind_hooks = intern_c_string ("insert-behind-hooks");
12785
937df231678c (Qbefore_change_functions, Qafter_change_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 12699
diff changeset
5339 staticpro (&Qinsert_behind_hooks);
105877
21bdda3ded62 * xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105669
diff changeset
5340 Qget_file_buffer = intern_c_string ("get-file-buffer");
5433
7ac1e6f1565f Don't include syntax.h.
Richard M. Stallman <rms@gnu.org>
parents: 5247
diff changeset
5341 staticpro (&Qget_file_buffer);
105877
21bdda3ded62 * xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105669
diff changeset
5342 Qpriority = intern_c_string ("priority");
5857
03f8720af7fb (sort-overlays): New function, extracted from xfaces.c.
Karl Heuer <kwzh@gnu.org>
parents: 5703
diff changeset
5343 staticpro (&Qpriority);
105877
21bdda3ded62 * xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105669
diff changeset
5344 Qbefore_string = intern_c_string ("before-string");
11693
efef31f1c42d (Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents: 11659
diff changeset
5345 staticpro (&Qbefore_string);
105877
21bdda3ded62 * xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105669
diff changeset
5346 Qafter_string = intern_c_string ("after-string");
11693
efef31f1c42d (Qbefore_string, Qafter_string): New vars.
Karl Heuer <kwzh@gnu.org>
parents: 11659
diff changeset
5347 staticpro (&Qafter_string);
105877
21bdda3ded62 * xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105669
diff changeset
5348 Qfirst_change_hook = intern_c_string ("first-change-hook");
12785
937df231678c (Qbefore_change_functions, Qafter_change_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 12699
diff changeset
5349 staticpro (&Qfirst_change_hook);
105877
21bdda3ded62 * xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105669
diff changeset
5350 Qbefore_change_functions = intern_c_string ("before-change-functions");
12785
937df231678c (Qbefore_change_functions, Qafter_change_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 12699
diff changeset
5351 staticpro (&Qbefore_change_functions);
105877
21bdda3ded62 * xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105669
diff changeset
5352 Qafter_change_functions = intern_c_string ("after-change-functions");
12785
937df231678c (Qbefore_change_functions, Qafter_change_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 12699
diff changeset
5353 staticpro (&Qafter_change_functions);
87977
0f04103be3bf (reset_buffer_local_variables): Implement `permanent-local-hook'.
Richard M. Stallman <rms@gnu.org>
parents: 87843
diff changeset
5354 /* The next one is initialized in init_buffer_once. */
48635
2a9a1d761581 (Qucs_set_table_for_input): New.
Dave Love <fx@gnu.org>
parents: 48355
diff changeset
5355 staticpro (&Qucs_set_table_for_input);
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5356
105877
21bdda3ded62 * xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105669
diff changeset
5357 Qkill_buffer_query_functions = intern_c_string ("kill-buffer-query-functions");
50014
3b2576528809 (Fkill_buffer): Use Frun_hook_with_args_until_failure
Richard M. Stallman <rms@gnu.org>
parents: 49974
diff changeset
5358 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
5359
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5360 Fput (Qprotected_field, Qerror_conditions,
105877
21bdda3ded62 * xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105669
diff changeset
5361 pure_cons (Qprotected_field, pure_cons (Qerror, Qnil)));
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5362 Fput (Qprotected_field, Qerror_message,
105877
21bdda3ded62 * xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105669
diff changeset
5363 make_pure_c_string ("Attempt to modify a protected field"));
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5364
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5365 /* All these use DEFVAR_LISP_NOPRO because the slots in
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5366 buffer_defaults will all be marked via Vbuffer_defaults. */
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5367
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5368 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
5369 &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
5370 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
5371 This is the same as (default-value 'mode-line-format). */);
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5372
25546
Gerd Moellmann <gerd@gnu.org>
parents: 25508
diff changeset
5373 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
5374 &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
5375 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
5376 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
5377
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39974
diff changeset
5378 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
5379 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
5380 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
5381
28688
3c44b2f54f82 (init_buffer_once): Handle extra_line_spacing.
Gerd Moellmann <gerd@gnu.org>
parents: 28636
diff changeset
5382 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
5383 &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
5384 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
5385 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
5386
62069
a0a348c8b14b (init_buffer_once): Set cursor_in_non_selected_windows default value.
Kim F. Storm <storm@cua.dk>
parents: 62030
diff changeset
5387 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
5388 &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
5389 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
5390 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
5391
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5392 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
5393 &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
5394 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
5395 This is the same as (default-value 'abbrev-mode). */);
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5396
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5397 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
5398 &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
5399 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
5400 This is the same as (default-value 'ctl-arrow). */);
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5401
62793
71f6142fcfb9 (Fbuffer_local_value): Make argument name match its use in docstring.
Juanma Barranquero <lekktu@gmail.com>
parents: 62069
diff changeset
5402 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
5403 &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
5404 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
5405 This is the same as (default-value 'enable-multibyte-characters). */);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49444
diff changeset
5406
62793
71f6142fcfb9 (Fbuffer_local_value): Make argument name match its use in docstring.
Juanma Barranquero <lekktu@gmail.com>
parents: 62069
diff changeset
5407 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
5408 &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
5409 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
5410 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
5411
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5412 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
5413 &buffer_defaults.truncate_lines,
6084dfa5f85d Reindent DEFUNs and DEFVARs woth doc: keywords.
Pavel Janík <Pavel@Janik.cz>
parents: 39988
diff changeset
5414 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
5415 This is the same as (default-value 'truncate-lines). */);
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5416
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5417 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
5418 &buffer_defaults.fill_column,
6084dfa5f85d Reindent DEFUNs and DEFVARs woth doc: keywords.
Pavel Janík <Pavel@Janik.cz>
parents: 39988
diff changeset
5419 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
5420 This is the same as (default-value 'fill-column). */);
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5421
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5422 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
5423 &buffer_defaults.left_margin,
6084dfa5f85d Reindent DEFUNs and DEFVARs woth doc: keywords.
Pavel Janík <Pavel@Janik.cz>
parents: 39988
diff changeset
5424 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
5425 This is the same as (default-value 'left-margin). */);
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5426
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5427 DEFVAR_LISP_NOPRO ("default-tab-width",
74720
cdf24e3ef426 Whitespace change.
Juanma Barranquero <lekktu@gmail.com>
parents: 74680
diff changeset
5428 &buffer_defaults.tab_width,
74721
24338a0d4577 Whitespace change (again).
Juanma Barranquero <lekktu@gmail.com>
parents: 74720
diff changeset
5429 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
5430 This is the same as (default-value 'tab-width). */);
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5431
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5432 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
5433 &buffer_defaults.case_fold_search,
6084dfa5f85d Reindent DEFUNs and DEFVARs woth doc: keywords.
Pavel Janík <Pavel@Janik.cz>
parents: 39988
diff changeset
5434 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
5435 This is the same as (default-value 'case-fold-search). */);
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5436
9785
a72386110d83 (init_buffer): Use DIRECTORY_SEP, IS_DIRECTORY_SEP macros,
Richard M. Stallman <rms@gnu.org>
parents: 9732
diff changeset
5437 #ifdef DOS_NT
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49444
diff changeset
5438 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
5439 &buffer_defaults.buffer_file_type,
40108
6084dfa5f85d Reindent DEFUNs and DEFVARs woth doc: keywords.
Pavel Janík <Pavel@Janik.cz>
parents: 39988
diff changeset
5440 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
5441 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
5442 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
5443 #endif
2b48fd9bc80e [MSDOS]: New buffer-local variable:
Richard M. Stallman <rms@gnu.org>
parents: 5433
diff changeset
5444
25021
7a31786a0335 (init_buffer_once): Init top_line_format.
Gerd Moellmann <gerd@gnu.org>
parents: 24975
diff changeset
5445 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
5446 &buffer_defaults.left_margin_cols,
40108
6084dfa5f85d Reindent DEFUNs and DEFVARs woth doc: keywords.
Pavel Janík <Pavel@Janik.cz>
parents: 39988
diff changeset
5447 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
5448 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
5449
7a31786a0335 (init_buffer_once): Init top_line_format.
Gerd Moellmann <gerd@gnu.org>
parents: 24975
diff changeset
5450 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
5451 &buffer_defaults.right_margin_cols,
17af4bfeb062 (init_buffer_once): Set buffer_defaults and
Kim F. Storm <storm@cua.dk>
parents: 51166
diff changeset
5452 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
5453 This is the same as (default-value 'right-margin-width). */);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49444
diff changeset
5454
51190
17af4bfeb062 (init_buffer_once): Set buffer_defaults and
Kim F. Storm <storm@cua.dk>
parents: 51166
diff changeset
5455 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
5456 &buffer_defaults.left_fringe_width,
17af4bfeb062 (init_buffer_once): Set buffer_defaults and
Kim F. Storm <storm@cua.dk>
parents: 51166
diff changeset
5457 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
5458 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
5459
17af4bfeb062 (init_buffer_once): Set buffer_defaults and
Kim F. Storm <storm@cua.dk>
parents: 51166
diff changeset
5460 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
5461 &buffer_defaults.right_fringe_width,
17af4bfeb062 (init_buffer_once): Set buffer_defaults and
Kim F. Storm <storm@cua.dk>
parents: 51166
diff changeset
5462 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
5463 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
5464
17af4bfeb062 (init_buffer_once): Set buffer_defaults and
Kim F. Storm <storm@cua.dk>
parents: 51166
diff changeset
5465 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
5466 &buffer_defaults.fringes_outside_margins,
17af4bfeb062 (init_buffer_once): Set buffer_defaults and
Kim F. Storm <storm@cua.dk>
parents: 51166
diff changeset
5467 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
5468 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
5469
17af4bfeb062 (init_buffer_once): Set buffer_defaults and
Kim F. Storm <storm@cua.dk>
parents: 51166
diff changeset
5470 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
5471 &buffer_defaults.scroll_bar_width,
17af4bfeb062 (init_buffer_once): Set buffer_defaults and
Kim F. Storm <storm@cua.dk>
parents: 51166
diff changeset
5472 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
5473 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
5474
17af4bfeb062 (init_buffer_once): Set buffer_defaults and
Kim F. Storm <storm@cua.dk>
parents: 51166
diff changeset
5475 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
5476 &buffer_defaults.vertical_scroll_bar_type,
17af4bfeb062 (init_buffer_once): Set buffer_defaults and
Kim F. Storm <storm@cua.dk>
parents: 51166
diff changeset
5477 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
5478 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
5479
25021
7a31786a0335 (init_buffer_once): Init top_line_format.
Gerd Moellmann <gerd@gnu.org>
parents: 24975
diff changeset
5480 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
5481 &buffer_defaults.indicate_empty_lines,
6084dfa5f85d Reindent DEFUNs and DEFVARs woth doc: keywords.
Pavel Janík <Pavel@Janik.cz>
parents: 39988
diff changeset
5482 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
5483 This is the same as (default-value 'indicate-empty-lines). */);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49444
diff changeset
5484
53602
4c14b3c50a31 (init_buffer_once): Set buffer_defaults and
Kim F. Storm <storm@cua.dk>
parents: 53350
diff changeset
5485 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
5486 &buffer_defaults.indicate_buffer_boundaries,
4c14b3c50a31 (init_buffer_once): Set buffer_defaults and
Kim F. Storm <storm@cua.dk>
parents: 53350
diff changeset
5487 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
5488 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
5489
69047
7e64cebb0463 (init_buffer_once): Set dummy default values for
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
5490 DEFVAR_LISP_NOPRO ("default-fringe-indicator-alist",
7e64cebb0463 (init_buffer_once): Set dummy default values for
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
5491 &buffer_defaults.fringe_indicator_alist,
7e64cebb0463 (init_buffer_once): Set dummy default values for
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
5492 doc: /* Default value of `fringe-indicator-alist' for buffers that don't override it.
7e64cebb0463 (init_buffer_once): Set dummy default values for
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
5493 This is the same as (default-value 'fringe-indicator-alist'). */);
7e64cebb0463 (init_buffer_once): Set dummy default values for
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
5494
7e64cebb0463 (init_buffer_once): Set dummy default values for
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
5495 DEFVAR_LISP_NOPRO ("default-fringe-cursor-alist",
7e64cebb0463 (init_buffer_once): Set dummy default values for
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
5496 &buffer_defaults.fringe_cursor_alist,
7e64cebb0463 (init_buffer_once): Set dummy default values for
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
5497 doc: /* Default value of `fringe-cursor-alist' for buffers that don't override it.
7e64cebb0463 (init_buffer_once): Set dummy default values for
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
5498 This is the same as (default-value 'fringe-cursor-alist'). */);
7e64cebb0463 (init_buffer_once): Set dummy default values for
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
5499
25021
7a31786a0335 (init_buffer_once): Init top_line_format.
Gerd Moellmann <gerd@gnu.org>
parents: 24975
diff changeset
5500 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
5501 &buffer_defaults.scroll_up_aggressively,
41027
54f6ee43146e (syms_of_buffer): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 40840
diff changeset
5502 doc: /* Default value of `scroll-up-aggressively'.
54f6ee43146e (syms_of_buffer): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 40840
diff changeset
5503 This value applies in buffers that don't have their own local values.
74595
42f97e1a6081 (syms_of_buffer) <cursor-in-non-selected-windows, line-spacing, left-margin,
Juanma Barranquero <lekktu@gmail.com>
parents: 74565
diff changeset
5504 This is the same as (default-value 'scroll-up-aggressively). */);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49444
diff changeset
5505
25021
7a31786a0335 (init_buffer_once): Init top_line_format.
Gerd Moellmann <gerd@gnu.org>
parents: 24975
diff changeset
5506 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
5507 &buffer_defaults.scroll_down_aggressively,
41027
54f6ee43146e (syms_of_buffer): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 40840
diff changeset
5508 doc: /* Default value of `scroll-down-aggressively'.
54f6ee43146e (syms_of_buffer): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 40840
diff changeset
5509 This value applies in buffers that don't have their own local values.
74595
42f97e1a6081 (syms_of_buffer) <cursor-in-non-selected-windows, line-spacing, left-margin,
Juanma Barranquero <lekktu@gmail.com>
parents: 74565
diff changeset
5510 This is the same as (default-value 'scroll-down-aggressively). */);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49444
diff changeset
5511
25546
Gerd Moellmann <gerd@gnu.org>
parents: 25508
diff changeset
5512 DEFVAR_PER_BUFFER ("header-line-format",
39971
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5513 &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
5514 Qnil,
41027
54f6ee43146e (syms_of_buffer): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 40840
diff changeset
5515 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
5516 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
5517 the mode line appears at the bottom. */);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49444
diff changeset
5518
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5519 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
5520 Qnil,
6084dfa5f85d Reindent DEFUNs and DEFVARs woth doc: keywords.
Pavel Janík <Pavel@Janik.cz>
parents: 39988
diff changeset
5521 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
5522 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
5523 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
5524 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
5525 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
5526 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
5527 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
5528 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
5529 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
5530 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
5531 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
5532 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
5533 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
5534 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
5535 with the specified properties PROPS applied.
39971
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5536 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
5537 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
5538 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
5539 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
5540 recursively and the results are effectively concatenated.
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5541 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
5542 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
5543 to the width specified by that number.
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5544 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
5545 (%-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
5546 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
5547 %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
5548 %F -- print frame name.
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5549 %* -- print %, * or hyphen. %+ -- print *, % or hyphen.
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5550 %& is like %*, but ignore read-only-ness.
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5551 % 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
5552 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
5553 %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
5554 %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
5555 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
5556 `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
5557 %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
5558 %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
5559 %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
5560 %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
5561 or print Bottom or All.
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5562 %n -- print Narrow if appropriate.
70931
83b791ca7b11 (mode-line-format): Fix docstring.
Juri Linkov <juri@jurta.org>
parents: 70816
diff changeset
5563 %t -- visited file is text or binary (if OS supports this distinction).
73173
b6668e8a8f5f (syms_of_buffer): Reorder coding systems in the
Juri Linkov <juri@jurta.org>
parents: 72596
diff changeset
5564 %z -- print mnemonics of keyboard, terminal, and buffer coding systems.
39971
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5565 %Z -- like %z, but including the end-of-line format.
70931
83b791ca7b11 (mode-line-format): Fix docstring.
Juri Linkov <juri@jurta.org>
parents: 70816
diff changeset
5566 %e -- print error message about full memory.
82179
70709e17ebee * xdisp.c (decode_mode_spec): Use '@' instead of 'R' to test for
Nick Roberts <nickrob@snap.net.nz>
parents: 82140
diff changeset
5567 %@ -- print @ or hyphen. @ means that default-directory is on a
70709e17ebee * xdisp.c (decode_mode_spec): Use '@' instead of 'R' to test for
Nick Roberts <nickrob@snap.net.nz>
parents: 82140
diff changeset
5568 remote machine.
39971
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5569 %[ -- print one [ for each recursive editing level. %] similar.
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5570 %% -- print %. %- -- print infinitely many dashes.
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5571 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
5572
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39974
diff changeset
5573 DEFVAR_LISP_NOPRO ("default-major-mode", &buffer_defaults.major_mode,
104793
e5f506a6a59d (default-major-mode): Move most of the doc from here...
Glenn Morris <rgm@gnu.org>
parents: 104280
diff changeset
5574 doc: /* *Value of `major-mode' for new buffers. */);
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5575
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5576 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
5577 make_number (Lisp_Symbol),
104793
e5f506a6a59d (default-major-mode): Move most of the doc from here...
Glenn Morris <rgm@gnu.org>
parents: 104280
diff changeset
5578 doc: /* Symbol for current buffer's major mode.
e5f506a6a59d (default-major-mode): Move most of the doc from here...
Glenn Morris <rgm@gnu.org>
parents: 104280
diff changeset
5579 The default value (normally `fundamental-mode') affects new buffers.
e5f506a6a59d (default-major-mode): Move most of the doc from here...
Glenn Morris <rgm@gnu.org>
parents: 104280
diff changeset
5580 A value of nil means to use the current buffer's major mode, provided
e5f506a6a59d (default-major-mode): Move most of the doc from here...
Glenn Morris <rgm@gnu.org>
parents: 104280
diff changeset
5581 it is not marked as "special".
e5f506a6a59d (default-major-mode): Move most of the doc from here...
Glenn Morris <rgm@gnu.org>
parents: 104280
diff changeset
5582
e5f506a6a59d (default-major-mode): Move most of the doc from here...
Glenn Morris <rgm@gnu.org>
parents: 104280
diff changeset
5583 When a mode is used by default, `find-file' switches to it before it
e5f506a6a59d (default-major-mode): Move most of the doc from here...
Glenn Morris <rgm@gnu.org>
parents: 104280
diff changeset
5584 reads the contents into the buffer and before it finishes setting up
e5f506a6a59d (default-major-mode): Move most of the doc from here...
Glenn Morris <rgm@gnu.org>
parents: 104280
diff changeset
5585 the buffer. Thus, the mode and its hooks should not expect certain
e5f506a6a59d (default-major-mode): Move most of the doc from here...
Glenn Morris <rgm@gnu.org>
parents: 104280
diff changeset
5586 variables such as `buffer-read-only' and `buffer-file-coding-system'
e5f506a6a59d (default-major-mode): Move most of the doc from here...
Glenn Morris <rgm@gnu.org>
parents: 104280
diff changeset
5587 to be set up. */);
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5588
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5589 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
5590 Qnil,
87843
e1d6c4e34d2c (syms_of_buffer) <mode-name>: Fix docstring.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 87649
diff changeset
5591 doc: /* Pretty name of current buffer's major mode.
98732
287704bda212 (syms_of_buffer): Doc fix.
Eli Zaretskii <eliz@gnu.org>
parents: 98070
diff changeset
5592 Usually a string, but can use any of the constructs for `mode-line-format',
287704bda212 (syms_of_buffer): Doc fix.
Eli Zaretskii <eliz@gnu.org>
parents: 98070
diff changeset
5593 which see.
287704bda212 (syms_of_buffer): Doc fix.
Eli Zaretskii <eliz@gnu.org>
parents: 98070
diff changeset
5594 Format with `format-mode-line' to produce a string value. */);
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39974
diff changeset
5595
85011
1d35aa875508 * buffer.c (syms_of_buffer) <local-abbrev-table>: Move from abbrev.c.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 83648
diff changeset
5596 DEFVAR_PER_BUFFER ("local-abbrev-table", &current_buffer->abbrev_table, Qnil,
1d35aa875508 * buffer.c (syms_of_buffer) <local-abbrev-table>: Move from abbrev.c.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 83648
diff changeset
5597 doc: /* Local (mode-specific) abbrev table of current buffer. */);
1d35aa875508 * buffer.c (syms_of_buffer) <local-abbrev-table>: Move from abbrev.c.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 83648
diff changeset
5598
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39974
diff changeset
5599 DEFVAR_PER_BUFFER ("abbrev-mode", &current_buffer->abbrev_mode, Qnil,
111222
cdad894f9ed0 Remove duplicate Lisp definitions of define-minor-mode variables defined in C.
Glenn Morris <rgm@gnu.org>
parents: 111123
diff changeset
5600 doc: /* Non-nil if Abbrev mode is enabled.
cdad894f9ed0 Remove duplicate Lisp definitions of define-minor-mode variables defined in C.
Glenn Morris <rgm@gnu.org>
parents: 111123
diff changeset
5601 Use the command `abbrev-mode' to change this variable. */);
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5602
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5603 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
5604 Qnil,
40108
6084dfa5f85d Reindent DEFUNs and DEFVARs woth doc: keywords.
Pavel Janík <Pavel@Janik.cz>
parents: 39988
diff changeset
5605 doc: /* *Non-nil if searches and matches should ignore case. */);
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5606
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5607 DEFVAR_PER_BUFFER ("fill-column", &current_buffer->fill_column,
105885
8103235103a7 Let integers use up 2 tags to give them one extra bit and double their range.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 105877
diff changeset
5608 make_number (LISP_INT_TAG),
46864
df9f70dd69a4 (syms_of_buffer) <fill-column>: Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 46599
diff changeset
5609 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
5610 Interactively, you can set the buffer local value using \\[set-fill-column]. */);
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5611
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5612 DEFVAR_PER_BUFFER ("left-margin", &current_buffer->left_margin,
105885
8103235103a7 Let integers use up 2 tags to give them one extra bit and double their range.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 105877
diff changeset
5613 make_number (LISP_INT_TAG),
74595
42f97e1a6081 (syms_of_buffer) <cursor-in-non-selected-windows, line-spacing, left-margin,
Juanma Barranquero <lekktu@gmail.com>
parents: 74565
diff changeset
5614 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
5615 Linefeed indents to this column in Fundamental mode. */);
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5616
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5617 DEFVAR_PER_BUFFER ("tab-width", &current_buffer->tab_width,
105885
8103235103a7 Let integers use up 2 tags to give them one extra bit and double their range.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 105877
diff changeset
5618 make_number (LISP_INT_TAG),
40108
6084dfa5f85d Reindent DEFUNs and DEFVARs woth doc: keywords.
Pavel Janík <Pavel@Janik.cz>
parents: 39988
diff changeset
5619 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
5620
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39974
diff changeset
5621 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
5622 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
5623 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
5624 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
5625 in the current display table (if there is one). */);
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5626
17022
907fb167f7de Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16840
diff changeset
5627 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
5628 &current_buffer->enable_multibyte_characters,
50304
d9d826db650f (overlays_in): Declare static.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50014
diff changeset
5629 Qnil,
40108
6084dfa5f85d Reindent DEFUNs and DEFVARs woth doc: keywords.
Pavel Janík <Pavel@Janik.cz>
parents: 39988
diff changeset
5630 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
5631 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
5632 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
5633
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5634 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
5635 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
5636 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
5637 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
5638 `(elisp)Text Representations'. */);
105877
21bdda3ded62 * xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105669
diff changeset
5639 XSYMBOL (intern_c_string ("enable-multibyte-characters"))->constant = 1;
17022
907fb167f7de Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16840
diff changeset
5640
18178
b45b431879bf (init_buffer_once): Inititialize the member
Kenichi Handa <handa@m17n.org>
parents: 18105
diff changeset
5641 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
5642 &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
5643 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
5644 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
5645 and other functions that use `write-region'.
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5646 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
5647
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5648 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
5649 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
5650 for the buffer file.
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5651
43630
a4789f07d85d (syms_of_buffer) <buffer-file-coding-system>: Doc fix.
Eli Zaretskii <eliz@gnu.org>
parents: 42982
diff changeset
5652 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
5653 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
5654
39971
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5655 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
5656
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5657 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
5658
107584
e0df0337f248 Retrospective commit from 2009-08-15.
Eli Zaretskii <eliz@gnu.org>
parents: 107583
diff changeset
5659 DEFVAR_PER_BUFFER ("bidi-display-reordering",
e0df0337f248 Retrospective commit from 2009-08-15.
Eli Zaretskii <eliz@gnu.org>
parents: 107583
diff changeset
5660 &current_buffer->bidi_display_reordering, Qnil,
108006
452f0cc5f879 Remove references to (default-)direction-reversed.
Juanma Barranquero <lekktu@gmail.com>
parents: 108003
diff changeset
5661 doc: /* Non-nil means reorder bidirectional text for display in the visual order. */);
107583
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents: 106185
diff changeset
5662
107602
d44bdcba4457 Retrospective commit from 2009-11-14.
Eli Zaretskii <eliz@gnu.org>
parents: 107596
diff changeset
5663 DEFVAR_PER_BUFFER ("bidi-paragraph-direction",
d44bdcba4457 Retrospective commit from 2009-11-14.
Eli Zaretskii <eliz@gnu.org>
parents: 107596
diff changeset
5664 &current_buffer->bidi_paragraph_direction, Qnil,
107595
69c12db7031d Retrospective commit from 2009-10-05.
Eli Zaretskii <eliz@gnu.org>
parents: 107584
diff changeset
5665 doc: /* *If non-nil, forces directionality of text paragraphs in the buffer.
108003
4b71850034e6 * buffer.h (struct buffer): Remove unused var `direction_reversed'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 107984
diff changeset
5666
107595
69c12db7031d Retrospective commit from 2009-10-05.
Eli Zaretskii <eliz@gnu.org>
parents: 107584
diff changeset
5667 If this is nil (the default), the direction of each paragraph is
69c12db7031d Retrospective commit from 2009-10-05.
Eli Zaretskii <eliz@gnu.org>
parents: 107584
diff changeset
5668 determined by the first strong directional character of its text.
69c12db7031d Retrospective commit from 2009-10-05.
Eli Zaretskii <eliz@gnu.org>
parents: 107584
diff changeset
5669 The values of `right-to-left' and `left-to-right' override that.
69c12db7031d Retrospective commit from 2009-10-05.
Eli Zaretskii <eliz@gnu.org>
parents: 107584
diff changeset
5670 Any other value is treated as nil.
108003
4b71850034e6 * buffer.h (struct buffer): Remove unused var `direction_reversed'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 107984
diff changeset
5671
107595
69c12db7031d Retrospective commit from 2009-10-05.
Eli Zaretskii <eliz@gnu.org>
parents: 107584
diff changeset
5672 This variable has no effect unless the buffer's value of
69c12db7031d Retrospective commit from 2009-10-05.
Eli Zaretskii <eliz@gnu.org>
parents: 107584
diff changeset
5673 \`bidi-display-reordering' is non-nil. */);
69c12db7031d Retrospective commit from 2009-10-05.
Eli Zaretskii <eliz@gnu.org>
parents: 107584
diff changeset
5674
107583
f35e7896a0fe Retrospective commit.
Eli Zaretskii <eliz@gnu.org>
parents: 106185
diff changeset
5675 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
5676 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
5677 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
5678
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5679 Note that this is overridden by the variable
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5680 `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
5681 and this buffer is not full-frame width. */);
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5682
96233
514e5b8b3fbf (syms_of_buffer): New variables default-word-wrap and word-wrap.
Chong Yidong <cyd@stupidchicken.com>
parents: 95826
diff changeset
5683 DEFVAR_PER_BUFFER ("word-wrap", &current_buffer->word_wrap, Qnil,
514e5b8b3fbf (syms_of_buffer): New variables default-word-wrap and word-wrap.
Chong Yidong <cyd@stupidchicken.com>
parents: 95826
diff changeset
5684 doc: /* *Non-nil means to use word-wrapping for continuation lines.
514e5b8b3fbf (syms_of_buffer): New variables default-word-wrap and word-wrap.
Chong Yidong <cyd@stupidchicken.com>
parents: 95826
diff changeset
5685 When word-wrapping is on, continuation lines are wrapped at the space
514e5b8b3fbf (syms_of_buffer): New variables default-word-wrap and word-wrap.
Chong Yidong <cyd@stupidchicken.com>
parents: 95826
diff changeset
5686 or tab character nearest to the right window edge.
514e5b8b3fbf (syms_of_buffer): New variables default-word-wrap and word-wrap.
Chong Yidong <cyd@stupidchicken.com>
parents: 95826
diff changeset
5687 If nil, continuation lines are wrapped at the right screen edge.
514e5b8b3fbf (syms_of_buffer): New variables default-word-wrap and word-wrap.
Chong Yidong <cyd@stupidchicken.com>
parents: 95826
diff changeset
5688
514e5b8b3fbf (syms_of_buffer): New variables default-word-wrap and word-wrap.
Chong Yidong <cyd@stupidchicken.com>
parents: 95826
diff changeset
5689 This variable has no effect if long lines are truncated (see
97810
ec7f95140247 (syms_of_buffer): Doc fix.
Glenn Morris <rgm@gnu.org>
parents: 97285
diff changeset
5690 `truncate-lines' and `truncate-partial-width-windows'). If you use
ec7f95140247 (syms_of_buffer): Doc fix.
Glenn Morris <rgm@gnu.org>
parents: 97285
diff changeset
5691 word-wrapping, you might want to reduce the value of
ec7f95140247 (syms_of_buffer): Doc fix.
Glenn Morris <rgm@gnu.org>
parents: 97285
diff changeset
5692 `truncate-partial-width-windows', since wrapping can make text readable
ec7f95140247 (syms_of_buffer): Doc fix.
Glenn Morris <rgm@gnu.org>
parents: 97285
diff changeset
5693 in narrower windows. */);
96233
514e5b8b3fbf (syms_of_buffer): New variables default-word-wrap and word-wrap.
Chong Yidong <cyd@stupidchicken.com>
parents: 95826
diff changeset
5694
9785
a72386110d83 (init_buffer): Use DIRECTORY_SEP, IS_DIRECTORY_SEP macros,
Richard M. Stallman <rms@gnu.org>
parents: 9732
diff changeset
5695 #ifdef DOS_NT
5502
2b48fd9bc80e [MSDOS]: New buffer-local variable:
Richard M. Stallman <rms@gnu.org>
parents: 5433
diff changeset
5696 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
5697 Qnil,
40108
6084dfa5f85d Reindent DEFUNs and DEFVARs woth doc: keywords.
Pavel Janík <Pavel@Janik.cz>
parents: 39988
diff changeset
5698 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
5699 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
5700 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
5701 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
5702 #endif
2b48fd9bc80e [MSDOS]: New buffer-local variable:
Richard M. Stallman <rms@gnu.org>
parents: 5433
diff changeset
5703
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5704 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
5705 make_number (Lisp_String),
40108
6084dfa5f85d Reindent DEFUNs and DEFVARs woth doc: keywords.
Pavel Janík <Pavel@Janik.cz>
parents: 39988
diff changeset
5706 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
5707 To interactively change the default directory, use command `cd'. */);
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5708
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5709 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
5710 Qnil,
40108
6084dfa5f85d Reindent DEFUNs and DEFVARs woth doc: keywords.
Pavel Janík <Pavel@Janik.cz>
parents: 39988
diff changeset
5711 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
5712 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
5713 the `auto-fill-chars' table.
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5714 NOTE: This variable is not a hook;
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5715 its value may not be a list of functions. */);
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5716
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5717 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
5718 make_number (Lisp_String),
40108
6084dfa5f85d Reindent DEFUNs and DEFVARs woth doc: keywords.
Pavel Janík <Pavel@Janik.cz>
parents: 39988
diff changeset
5719 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
5720
10751
dea8f022819d (syms_of_buffer): Set up Lisp var buffer-file-truename.
Richard M. Stallman <rms@gnu.org>
parents: 10668
diff changeset
5721 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
5722 make_number (Lisp_String),
40108
6084dfa5f85d Reindent DEFUNs and DEFVARs woth doc: keywords.
Pavel Janík <Pavel@Janik.cz>
parents: 39988
diff changeset
5723 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
5724 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
5725 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
5726
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5727 DEFVAR_PER_BUFFER ("buffer-auto-save-file-name",
1041
da04b25b1759 Formatting change
Jim Blandy <jimb@redhat.com>
parents: 1038
diff changeset
5728 &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
5729 make_number (Lisp_String),
41027
54f6ee43146e (syms_of_buffer): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 40840
diff changeset
5730 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
5731 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
5732
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39974
diff changeset
5733 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
5734 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
5735
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39974
diff changeset
5736 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
5737 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
5738 Backing up is done before the first time the file is saved. */);
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5739
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5740 DEFVAR_PER_BUFFER ("buffer-saved-size", &current_buffer->save_length,
105885
8103235103a7 Let integers use up 2 tags to give them one extra bit and double their range.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 105877
diff changeset
5741 make_number (LISP_INT_TAG),
40108
6084dfa5f85d Reindent DEFUNs and DEFVARs woth doc: keywords.
Pavel Janík <Pavel@Janik.cz>
parents: 39988
diff changeset
5742 doc: /* Length of current buffer when last read in, saved or auto-saved.
103917
aa5e8ff5a9c4 * fileio.c (Fwrite_region, Fdo_auto_save): Handle save_length = -2.
Richard M. Stallman <rms@gnu.org>
parents: 102966
diff changeset
5743 0 initially.
aa5e8ff5a9c4 * fileio.c (Fwrite_region, Fdo_auto_save): Handle save_length = -2.
Richard M. Stallman <rms@gnu.org>
parents: 102966
diff changeset
5744 -1 means auto-saving turned off until next real save.
aa5e8ff5a9c4 * fileio.c (Fwrite_region, Fdo_auto_save): Handle save_length = -2.
Richard M. Stallman <rms@gnu.org>
parents: 102966
diff changeset
5745
aa5e8ff5a9c4 * fileio.c (Fwrite_region, Fdo_auto_save): Handle save_length = -2.
Richard M. Stallman <rms@gnu.org>
parents: 102966
diff changeset
5746 If you set this to -2, that means don't turn off auto-saving in this buffer
aa5e8ff5a9c4 * fileio.c (Fwrite_region, Fdo_auto_save): Handle save_length = -2.
Richard M. Stallman <rms@gnu.org>
parents: 102966
diff changeset
5747 if its text size shrinks. If you use `buffer-swap-text' on a buffer,
aa5e8ff5a9c4 * fileio.c (Fwrite_region, Fdo_auto_save): Handle save_length = -2.
Richard M. Stallman <rms@gnu.org>
parents: 102966
diff changeset
5748 you probably should set this to -2 in that buffer. */);
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5749
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5750 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
5751 Qnil,
41027
54f6ee43146e (syms_of_buffer): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 40840
diff changeset
5752 doc: /* Non-nil enables selective display.
78053
69559cc5606f (syms_of_buffer) <selective-display>: Fix typo in docstring.
Juanma Barranquero <lekktu@gmail.com>
parents: 77843
diff changeset
5753 An integer N as value means display only lines
69559cc5606f (syms_of_buffer) <selective-display>: Fix typo in docstring.
Juanma Barranquero <lekktu@gmail.com>
parents: 77843
diff changeset
5754 that start with less than N columns of space.
41027
54f6ee43146e (syms_of_buffer): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 40840
diff changeset
5755 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
5756 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
5757 in a file, save the ^M as a newline. */);
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5758
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5759 #ifndef old
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5760 DEFVAR_PER_BUFFER ("selective-display-ellipses",
97285
6c695773401d * buffer.c (syms_of_buffer) <scroll-up-aggressively>:
Juanma Barranquero <lekktu@gmail.com>
parents: 97142
diff changeset
5761 &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
5762 Qnil,
40567
7c28809db274 (selective-display-ellipses): Doc fix.
Pavel Janík <Pavel@Janik.cz>
parents: 40108
diff changeset
5763 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
5764 #endif
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5765
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39974
diff changeset
5766 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
5767 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
5768 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
5769 `overwrite-mode-binary', or nil.
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5770 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
5771 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
5772 until the tab is filled in.
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5773 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
5774
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5775 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
5776 Qnil,
40108
6084dfa5f85d Reindent DEFUNs and DEFVARs woth doc: keywords.
Pavel Janík <Pavel@Janik.cz>
parents: 39988
diff changeset
5777 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
5778
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5779 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
5780 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
5781 `set-window-display-table' and `window-display-table'.
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5782
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5783 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
5784 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
5785 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
5786
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5787 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
5788 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
5789 the character whose code is C. Each element should be a vector of
74745
af518323048e (syms_of_buffer) <buffer-display-table>, scroll-up-aggressively,
Juanma Barranquero <lekktu@gmail.com>
parents: 74721
diff changeset
5790 characters or nil. The value nil means display the character in the
af518323048e (syms_of_buffer) <buffer-display-table>, scroll-up-aggressively,
Juanma Barranquero <lekktu@gmail.com>
parents: 74721
diff changeset
5791 default fashion; otherwise, the characters from the vector are delivered
af518323048e (syms_of_buffer) <buffer-display-table>, scroll-up-aggressively,
Juanma Barranquero <lekktu@gmail.com>
parents: 74721
diff changeset
5792 to the screen instead of the original character.
39971
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5793
76557
b99f6ff8775b (syms_of_buffer): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 76526
diff changeset
5794 For example, (aset buffer-display-table ?X [?Y]) tells Emacs
76526
89c077825908 (syms_of_buffer) <buffer-display-table>: Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents: 75784
diff changeset
5795 to display a capital Y instead of each X character.
39971
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5796
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5797 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
5798
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5799 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
5800 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
5801 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
5802 (extra-slot 2, a single character);
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5803 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
5804 a single character);
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5805 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
5806 a vector of characters);
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5807 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
5808 (extra-slot 5, a single character).
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5809
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5810 See also the functions `display-table-slot' and `set-display-table-slot'. */);
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5811
51190
17af4bfeb062 (init_buffer_once): Set buffer_defaults and
Kim F. Storm <storm@cua.dk>
parents: 51166
diff changeset
5812 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
5813 Qnil,
40108
6084dfa5f85d Reindent DEFUNs and DEFVARs woth doc: keywords.
Pavel Janík <Pavel@Janik.cz>
parents: 39988
diff changeset
5814 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
5815 A value of nil means no marginal area. */);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49444
diff changeset
5816
51190
17af4bfeb062 (init_buffer_once): Set buffer_defaults and
Kim F. Storm <storm@cua.dk>
parents: 51166
diff changeset
5817 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
5818 Qnil,
40108
6084dfa5f85d Reindent DEFUNs and DEFVARs woth doc: keywords.
Pavel Janík <Pavel@Janik.cz>
parents: 39988
diff changeset
5819 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
5820 A value of nil means no marginal area. */);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49444
diff changeset
5821
51190
17af4bfeb062 (init_buffer_once): Set buffer_defaults and
Kim F. Storm <storm@cua.dk>
parents: 51166
diff changeset
5822 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
5823 Qnil,
17af4bfeb062 (init_buffer_once): Set buffer_defaults and
Kim F. Storm <storm@cua.dk>
parents: 51166
diff changeset
5824 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
5825 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
5826 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
5827
17af4bfeb062 (init_buffer_once): Set buffer_defaults and
Kim F. Storm <storm@cua.dk>
parents: 51166
diff changeset
5828 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
5829 Qnil,
17af4bfeb062 (init_buffer_once): Set buffer_defaults and
Kim F. Storm <storm@cua.dk>
parents: 51166
diff changeset
5830 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
5831 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
5832 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
5833
17af4bfeb062 (init_buffer_once): Set buffer_defaults and
Kim F. Storm <storm@cua.dk>
parents: 51166
diff changeset
5834 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
5835 Qnil,
17af4bfeb062 (init_buffer_once): Set buffer_defaults and
Kim F. Storm <storm@cua.dk>
parents: 51166
diff changeset
5836 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
5837 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
5838
17af4bfeb062 (init_buffer_once): Set buffer_defaults and
Kim F. Storm <storm@cua.dk>
parents: 51166
diff changeset
5839 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
5840 Qnil,
17af4bfeb062 (init_buffer_once): Set buffer_defaults and
Kim F. Storm <storm@cua.dk>
parents: 51166
diff changeset
5841 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
5842 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
5843
17af4bfeb062 (init_buffer_once): Set buffer_defaults and
Kim F. Storm <storm@cua.dk>
parents: 51166
diff changeset
5844 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
5845 Qnil,
17af4bfeb062 (init_buffer_once): Set buffer_defaults and
Kim F. Storm <storm@cua.dk>
parents: 51166
diff changeset
5846 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
5847 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
5848 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
5849
59114
3f2406abbe2a (Fbuffer_disable_undo): Deleted (moved to simple.el).
Richard M. Stallman <rms@gnu.org>
parents: 58618
diff changeset
5850 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
5851 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
5852 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
5853
25021
7a31786a0335 (init_buffer_once): Init top_line_format.
Gerd Moellmann <gerd@gnu.org>
parents: 24975
diff changeset
5854 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
5855 &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
5856 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
5857 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
5858 window-systems. */);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49444
diff changeset
5859
53602
4c14b3c50a31 (init_buffer_once): Set buffer_defaults and
Kim F. Storm <storm@cua.dk>
parents: 53350
diff changeset
5860 DEFVAR_PER_BUFFER ("indicate-buffer-boundaries",
4c14b3c50a31 (init_buffer_once): Set buffer_defaults and
Kim F. Storm <storm@cua.dk>
parents: 53350
diff changeset
5861 &current_buffer->indicate_buffer_boundaries, Qnil,
4c14b3c50a31 (init_buffer_once): Set buffer_defaults and
Kim F. Storm <storm@cua.dk>
parents: 53350
diff changeset
5862 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
5863 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
5864 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
5865 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
5866 arrow bitmaps.
57245
8c66fdb3c3ba (syms_of_buffer) <indicate-buffer-boundaries>:
Kim F. Storm <storm@cua.dk>
parents: 57138
diff changeset
5867
8c66fdb3c3ba (syms_of_buffer) <indicate-buffer-boundaries>:
Kim F. Storm <storm@cua.dk>
parents: 57138
diff changeset
5868 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
5869 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
5870 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
5871 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
5872
8f225aca7c72 (syms_of_buffer) <indicate-buffer-boundaries>: Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 57705
diff changeset
5873 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
5874 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
5875 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
5876 `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
5877 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
5878 this indicator.
8c66fdb3c3ba (syms_of_buffer) <indicate-buffer-boundaries>:
Kim F. Storm <storm@cua.dk>
parents: 57138
diff changeset
5879
8c66fdb3c3ba (syms_of_buffer) <indicate-buffer-boundaries>:
Kim F. Storm <storm@cua.dk>
parents: 57138
diff changeset
5880 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
5881 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
5882 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
5883 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
5884
69047
7e64cebb0463 (init_buffer_once): Set dummy default values for
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
5885 DEFVAR_PER_BUFFER ("fringe-indicator-alist",
7e64cebb0463 (init_buffer_once): Set dummy default values for
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
5886 &current_buffer->fringe_indicator_alist, Qnil,
7e64cebb0463 (init_buffer_once): Set dummy default values for
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
5887 doc: /* *Mapping from logical to physical fringe indicator bitmaps.
7e64cebb0463 (init_buffer_once): Set dummy default values for
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
5888 The value is an alist where each element (INDICATOR . BITMAPS)
7e64cebb0463 (init_buffer_once): Set dummy default values for
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
5889 specifies the fringe bitmaps used to display a specific logical
7e64cebb0463 (init_buffer_once): Set dummy default values for
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
5890 fringe indicator.
7e64cebb0463 (init_buffer_once): Set dummy default values for
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
5891
7e64cebb0463 (init_buffer_once): Set dummy default values for
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
5892 INDICATOR specifies the logical indicator type which is one of the
7e64cebb0463 (init_buffer_once): Set dummy default values for
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
5893 following symbols: `truncation' , `continuation', `overlay-arrow',
109338
fc5ebbbba4f3 * buffer.c (syms_of_buffer) <fringe-indicator-alist>: Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents: 107311
diff changeset
5894 `top', `bottom', `top-bottom', `up', `down', empty-line', or `unknown'.
fc5ebbbba4f3 * buffer.c (syms_of_buffer) <fringe-indicator-alist>: Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents: 107311
diff changeset
5895
fc5ebbbba4f3 * buffer.c (syms_of_buffer) <fringe-indicator-alist>: Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents: 107311
diff changeset
5896 BITMAPS is a list of symbols (LEFT RIGHT [LEFT1 RIGHT1]) which specifies
69047
7e64cebb0463 (init_buffer_once): Set dummy default values for
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
5897 the actual bitmap shown in the left or right fringe for the logical
7e64cebb0463 (init_buffer_once): Set dummy default values for
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
5898 indicator. LEFT and RIGHT are the bitmaps shown in the left and/or
7e64cebb0463 (init_buffer_once): Set dummy default values for
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
5899 right fringe for the specific indicator. The LEFT1 or RIGHT1 bitmaps
109338
fc5ebbbba4f3 * buffer.c (syms_of_buffer) <fringe-indicator-alist>: Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents: 107311
diff changeset
5900 are used only for the `bottom' and `top-bottom' indicators when the
fc5ebbbba4f3 * buffer.c (syms_of_buffer) <fringe-indicator-alist>: Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents: 107311
diff changeset
5901 last (only) line has no final newline. BITMAPS may also be a single
69047
7e64cebb0463 (init_buffer_once): Set dummy default values for
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
5902 symbol which is used in both left and right fringes. */);
7e64cebb0463 (init_buffer_once): Set dummy default values for
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
5903
7e64cebb0463 (init_buffer_once): Set dummy default values for
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
5904 DEFVAR_PER_BUFFER ("fringe-cursor-alist",
7e64cebb0463 (init_buffer_once): Set dummy default values for
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
5905 &current_buffer->fringe_cursor_alist, Qnil,
7e64cebb0463 (init_buffer_once): Set dummy default values for
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
5906 doc: /* *Mapping from logical to physical fringe cursor bitmaps.
7e64cebb0463 (init_buffer_once): Set dummy default values for
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
5907 The value is an alist where each element (CURSOR . BITMAP)
7e64cebb0463 (init_buffer_once): Set dummy default values for
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
5908 specifies the fringe bitmaps used to display a specific logical
7e64cebb0463 (init_buffer_once): Set dummy default values for
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
5909 cursor type in the fringe.
7e64cebb0463 (init_buffer_once): Set dummy default values for
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
5910
7e64cebb0463 (init_buffer_once): Set dummy default values for
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
5911 CURSOR specifies the logical cursor type which is one of the following
7e64cebb0463 (init_buffer_once): Set dummy default values for
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
5912 symbols: `box' , `hollow', `bar', `hbar', or `hollow-small'. The last
7e64cebb0463 (init_buffer_once): Set dummy default values for
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
5913 one is used to show a hollow cursor on narrow lines display lines
7e64cebb0463 (init_buffer_once): Set dummy default values for
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
5914 where the normal hollow cursor will not fit.
7e64cebb0463 (init_buffer_once): Set dummy default values for
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
5915
7e64cebb0463 (init_buffer_once): Set dummy default values for
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
5916 BITMAP is the corresponding fringe bitmap shown for the logical
7e64cebb0463 (init_buffer_once): Set dummy default values for
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
5917 cursor type. */);
7e64cebb0463 (init_buffer_once): Set dummy default values for
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
5918
25021
7a31786a0335 (init_buffer_once): Init top_line_format.
Gerd Moellmann <gerd@gnu.org>
parents: 24975
diff changeset
5919 DEFVAR_PER_BUFFER ("scroll-up-aggressively",
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39974
diff changeset
5920 &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
5921 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
5922 If you move point off the bottom, the window scrolls automatically.
74745
af518323048e (syms_of_buffer) <buffer-display-table>, scroll-up-aggressively,
Juanma Barranquero <lekktu@gmail.com>
parents: 74721
diff changeset
5923 This variable controls how far it scrolls. The value nil, the default,
49057
8c97b527621e (syms_of_buffer) <scroll-up-aggressively, scroll-down-aggressively>: Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 48947
diff changeset
5924 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
5925 that fraction of the window's height from the bottom of the window.
97285
6c695773401d * buffer.c (syms_of_buffer) <scroll-up-aggressively>:
Juanma Barranquero <lekktu@gmail.com>
parents: 97142
diff changeset
5926 When the value is 0.0, point goes at the bottom line, which in the
6c695773401d * buffer.c (syms_of_buffer) <scroll-up-aggressively>:
Juanma Barranquero <lekktu@gmail.com>
parents: 97142
diff changeset
5927 simple case that you moved off with C-f means scrolling just one line.
6c695773401d * buffer.c (syms_of_buffer) <scroll-up-aggressively>:
Juanma Barranquero <lekktu@gmail.com>
parents: 97142
diff changeset
5928 1.0 means point goes at the top, so that in that simple case, the
6c695773401d * buffer.c (syms_of_buffer) <scroll-up-aggressively>:
Juanma Barranquero <lekktu@gmail.com>
parents: 97142
diff changeset
5929 window scrolls by a full window height. Meaningful values are
48947
3bdd36228f48 (syms_of_buffer) <scroll-up-aggressively, scroll-down-aggressively>: Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 48776
diff changeset
5930 between 0.0 and 1.0, inclusive. */);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49444
diff changeset
5931
25021
7a31786a0335 (init_buffer_once): Init top_line_format.
Gerd Moellmann <gerd@gnu.org>
parents: 24975
diff changeset
5932 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
5933 &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
5934 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
5935 If you move point off the top, the window scrolls automatically.
74745
af518323048e (syms_of_buffer) <buffer-display-table>, scroll-up-aggressively,
Juanma Barranquero <lekktu@gmail.com>
parents: 74721
diff changeset
5936 This variable controls how far it scrolls. The value nil, the default,
49057
8c97b527621e (syms_of_buffer) <scroll-up-aggressively, scroll-down-aggressively>: Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 48947
diff changeset
5937 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
5938 that fraction of the window's height from the top of the window.
97285
6c695773401d * buffer.c (syms_of_buffer) <scroll-up-aggressively>:
Juanma Barranquero <lekktu@gmail.com>
parents: 97142
diff changeset
5939 When the value is 0.0, point goes at the top line, which in the
6c695773401d * buffer.c (syms_of_buffer) <scroll-up-aggressively>:
Juanma Barranquero <lekktu@gmail.com>
parents: 97142
diff changeset
5940 simple case that you moved off with C-b means scrolling just one line.
6c695773401d * buffer.c (syms_of_buffer) <scroll-up-aggressively>:
Juanma Barranquero <lekktu@gmail.com>
parents: 97142
diff changeset
5941 1.0 means point goes at the bottom, so that in that simple case, the
6c695773401d * buffer.c (syms_of_buffer) <scroll-up-aggressively>:
Juanma Barranquero <lekktu@gmail.com>
parents: 97142
diff changeset
5942 window scrolls by a full window height. Meaningful values are
48947
3bdd36228f48 (syms_of_buffer) <scroll-up-aggressively, scroll-down-aggressively>: Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 48776
diff changeset
5943 between 0.0 and 1.0, inclusive. */);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49444
diff changeset
5944
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5945 /*DEFVAR_LISP ("debug-check-symbol", &Vcheck_symbol,
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5946 "Don't ask.");
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5947 */
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5948
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39974
diff changeset
5949 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
5950 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
5951 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
5952 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
5953 \(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
5954 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
5955
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5956 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
5957 don't call any before-change or after-change functions.
110838
63399fcc7ef2 Doc fix.
Glenn Morris <rgm@gnu.org>
parents: 109338
diff changeset
5958 That's because `inhibit-modification-hooks' is temporarily set non-nil.
39971
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5959
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5960 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
5961 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
5962 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
5963 Vbefore_change_functions = Qnil;
121f2c5eba5e (Vafter_change_functions, Vbefore_change_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 6697
diff changeset
5964
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39974
diff changeset
5965 DEFVAR_LISP ("after-change-functions", &Vafter_change_functions,
44790
56ce64222cbe (syms_of_buffer): Doc fix.
Colin Walters <walters@gnu.org>
parents: 44784
diff changeset
5966 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
5967 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
5968 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
5969 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
5970 \(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
5971 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
5972 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
5973
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5974 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
5975 don't call any before-change or after-change functions.
110838
63399fcc7ef2 Doc fix.
Glenn Morris <rgm@gnu.org>
parents: 109338
diff changeset
5976 That's because `inhibit-modification-hooks' is temporarily set non-nil.
39971
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5977
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5978 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
5979 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
5980 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
5981 Vafter_change_functions = Qnil;
121f2c5eba5e (Vafter_change_functions, Vbefore_change_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 6697
diff changeset
5982
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39974
diff changeset
5983 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
5984 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
5985 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
5986 Vfirst_change_hook = Qnil;
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
5987
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39974
diff changeset
5988 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
5989 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
5990 Recent changes come first; older changes follow newer.
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5991
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5992 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
5993 position BEG and ends at position END.
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5994
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5995 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
5996 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
5997 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
5998
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
5999 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
6000 \"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
6001 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
6002 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
6003 obsolete.
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
6004
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
6005 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
6006 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
6007 and VALUE is the old value.
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
6008
59833
62b43d677801 (syms_of_buffer) <buffer-undo-list>: Doc fix.
Kim F. Storm <storm@cua.dk>
parents: 59780
diff changeset
6009 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
6010 \(apply FUN-NAME ARGS).
62b43d677801 (syms_of_buffer) <buffer-undo-list>: Doc fix.
Kim F. Storm <storm@cua.dk>
parents: 59780
diff changeset
6011
62b43d677801 (syms_of_buffer) <buffer-undo-list>: Doc fix.
Kim F. Storm <storm@cua.dk>
parents: 59780
diff changeset
6012 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
6013 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
6014 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
6015 this change.
59780
9d293bf75d6c (syms_of_buffer) <buffer-undo-list>: Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 59194
diff changeset
6016
39971
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
6017 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
6018 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
6019
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
6020 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
6021 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
6022 point at POSITION.
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
6023
74160
6e1dfb25e826 (syms_of_buffer) <buffer-undo-list>: Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents: 73173
diff changeset
6024 Entries with value `nil' mark undo boundaries. The undo command treats
6e1dfb25e826 (syms_of_buffer) <buffer-undo-list>: Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents: 73173
diff changeset
6025 the changes between two undo boundaries as a single step to be undone.
39971
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
6026
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
6027 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
6028
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39974
diff changeset
6029 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
6030 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
6031
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39974
diff changeset
6032 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
6033 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
6034
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
6035 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
6036 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
6037 `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
6038 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
6039 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
6040 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
6041 longer to update the display.
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
6042
57705
804f28bbd89c (syms_of_buffer): Fix a few typos.
David Kastrup <dak@gnu.org>
parents: 57245
diff changeset
6043 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
6044 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
6045 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
6046 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
6047 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
6048 same, fixed screen width.
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
6049
57705
804f28bbd89c (syms_of_buffer): Fix a few typos.
David Kastrup <dak@gnu.org>
parents: 57245
diff changeset
6050 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
6051 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
6052 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
6053 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
6054
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
6055 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
6056 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
6057 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
6058 functions; it should only affect their performance. */);
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
6059
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39974
diff changeset
6060 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
6061 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
6062
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39974
diff changeset
6063 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
6064 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
6065 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
6066 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
6067
56976
b3aa8cb4c381 (reset_buffer, init_buffer_once): Handle auto_save_file_format field.
Luc Teirlinck <teirllm@auburn.edu>
parents: 56669
diff changeset
6068 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
6069 &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
6070 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
6071 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
6072 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
6073 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
6074
10967
b53b84b6f46d (reset_buffer_local_variables): Init invisibility.
Richard M. Stallman <rms@gnu.org>
parents: 10916
diff changeset
6075 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
6076 &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
6077 doc: /* Invisibility spec of this buffer.
39971
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
6078 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
6079 if it has a non-nil `invisible' property.
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
6080 If the value is a list, a text character is invisible if its `invisible'
77843
f49a56c237e0 (syms_of_buffer): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 77176
diff changeset
6081 property is an element in that list (or is a list with members in common).
39971
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
6082 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
6083 then characters with property value PROP are invisible,
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
6084 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
6085
17218
a57ca25e9c62 (reset_buffer): Initialize display_count slot.
Richard M. Stallman <rms@gnu.org>
parents: 17124
diff changeset
6086 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
6087 &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
6088 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
6089 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
6090
b6edeb61a779 (syms_of_buffer): Set up Lisp variable buffer-display-time.
Richard M. Stallman <rms@gnu.org>
parents: 22023
diff changeset
6091 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
6092 &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
6093 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
6094 The function `set-window-buffer' updates this variable
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
6095 to the value obtained by calling `current-time'.
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
6096 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
6097
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39974
diff changeset
6098 DEFVAR_LISP ("transient-mark-mode", &Vtransient_mark_mode,
111222
cdad894f9ed0 Remove duplicate Lisp definitions of define-minor-mode variables defined in C.
Glenn Morris <rgm@gnu.org>
parents: 111123
diff changeset
6099 doc: /* Non-nil if Transient Mark mode is enabled.
cdad894f9ed0 Remove duplicate Lisp definitions of define-minor-mode variables defined in C.
Glenn Morris <rgm@gnu.org>
parents: 111123
diff changeset
6100 See the command `transient-mark-mode' for a description of this minor mode.
cdad894f9ed0 Remove duplicate Lisp definitions of define-minor-mode variables defined in C.
Glenn Morris <rgm@gnu.org>
parents: 111123
diff changeset
6101
cdad894f9ed0 Remove duplicate Lisp definitions of define-minor-mode variables defined in C.
Glenn Morris <rgm@gnu.org>
parents: 111123
diff changeset
6102 Non-nil also enables highlighting of the region whenever the mark is active.
cdad894f9ed0 Remove duplicate Lisp definitions of define-minor-mode variables defined in C.
Glenn Morris <rgm@gnu.org>
parents: 111123
diff changeset
6103 The variable `highlight-nonselected-windows' controls whether to highlight
cdad894f9ed0 Remove duplicate Lisp definitions of define-minor-mode variables defined in C.
Glenn Morris <rgm@gnu.org>
parents: 111123
diff changeset
6104 all windows or just the selected window.
cdad894f9ed0 Remove duplicate Lisp definitions of define-minor-mode variables defined in C.
Glenn Morris <rgm@gnu.org>
parents: 111123
diff changeset
6105
111945
c00190a8c8ef Merge from emacs-23
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 111222
diff changeset
6106 Lisp programs may give this variable certain special values:
c00190a8c8ef Merge from emacs-23
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 111222
diff changeset
6107
c00190a8c8ef Merge from emacs-23
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 111222
diff changeset
6108 - A value of `lambda' enables Transient Mark mode temporarily.
c00190a8c8ef Merge from emacs-23
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 111222
diff changeset
6109 It is disabled again after any subsequent action that would
c00190a8c8ef Merge from emacs-23
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 111222
diff changeset
6110 normally deactivate the mark (e.g. buffer modification).
c00190a8c8ef Merge from emacs-23
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 111222
diff changeset
6111
c00190a8c8ef Merge from emacs-23
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 111222
diff changeset
6112 - A value of (only . OLDVAL) enables Transient Mark mode
c00190a8c8ef Merge from emacs-23
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 111222
diff changeset
6113 temporarily. After any subsequent point motion command that is
c00190a8c8ef Merge from emacs-23
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 111222
diff changeset
6114 not shift-translated, or any other action that would normally
c00190a8c8ef Merge from emacs-23
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 111222
diff changeset
6115 deactivate the mark (e.g. buffer modification), the value of
c00190a8c8ef Merge from emacs-23
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 111222
diff changeset
6116 `transient-mark-mode' is set to OLDVAL. */);
2043
a1ab3501653c (reset_buffer_local_variables): Reset mark_active.
Richard M. Stallman <rms@gnu.org>
parents: 2020
diff changeset
6117 Vtransient_mark_mode = Qnil;
a1ab3501653c (reset_buffer_local_variables): Reset mark_active.
Richard M. Stallman <rms@gnu.org>
parents: 2020
diff changeset
6118
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39974
diff changeset
6119 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
6120 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
6121 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
6122 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
6123 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
6124 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
6125 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
6126
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39974
diff changeset
6127 DEFVAR_PER_BUFFER ("cursor-type", &current_buffer->cursor_type, Qnil,
74680
a331aebfdf6a (Fkill_buffer): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents: 74595
diff changeset
6128 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
6129 Values are interpreted as follows:
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
6130
64572
339bbffbcd05 (syms_of_buffer) <cursor-type>: Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents: 64469
diff changeset
6131 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
6132 nil don't display a cursor
339bbffbcd05 (syms_of_buffer) <cursor-type>: Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents: 64469
diff changeset
6133 box display a filled box cursor
339bbffbcd05 (syms_of_buffer) <cursor-type>: Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents: 64469
diff changeset
6134 hollow display a hollow box cursor
339bbffbcd05 (syms_of_buffer) <cursor-type>: Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents: 64469
diff changeset
6135 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
6136 (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
6137 hbar display a horizontal bar cursor with default height
63570
7b153a401f5c Finish previous change.
Richard M. Stallman <rms@gnu.org>
parents: 63545
diff changeset
6138 (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
6139 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
6140
99626
df0a1afd03b2 (syms_of_buffer): Fix doc-string of cursor-type.
Martin Rudalics <rudalics@gmx.at>
parents: 99080
diff changeset
6141 When the buffer is displayed in a non-selected window, the
df0a1afd03b2 (syms_of_buffer): Fix doc-string of cursor-type.
Martin Rudalics <rudalics@gmx.at>
parents: 99080
diff changeset
6142 cursor's appearance is instead controlled by the variable
df0a1afd03b2 (syms_of_buffer): Fix doc-string of cursor-type.
Martin Rudalics <rudalics@gmx.at>
parents: 99080
diff changeset
6143 `cursor-in-non-selected-windows'. */);
28322
986882bafaf1 (reset_buffer): Initialize buffer's cursor_type.
Gerd Moellmann <gerd@gnu.org>
parents: 28314
diff changeset
6144
28688
3c44b2f54f82 (init_buffer_once): Handle extra_line_spacing.
Gerd Moellmann <gerd@gnu.org>
parents: 28636
diff changeset
6145 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
6146 &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
6147 doc: /* Additional space to put between lines when displaying a buffer.
102966
a58ef8dce7bd (syms_of_buffer) <line-spacing>: Doc fix.
Eli Zaretskii <eliz@gnu.org>
parents: 102619
diff changeset
6148 The space is measured in pixels, and put below lines on graphic displays,
a58ef8dce7bd (syms_of_buffer) <line-spacing>: Doc fix.
Eli Zaretskii <eliz@gnu.org>
parents: 102619
diff changeset
6149 see `display-graphic-p'.
55242
d57364949309 (syms_of_buffer) <line-spacing>: Allow float value.
Kim F. Storm <storm@cua.dk>
parents: 55140
diff changeset
6150 If value is a floating point number, it specifies the spacing relative
74595
42f97e1a6081 (syms_of_buffer) <cursor-in-non-selected-windows, line-spacing, left-margin,
Juanma Barranquero <lekktu@gmail.com>
parents: 74565
diff changeset
6151 to the default frame line height. A value of nil means add no extra space. */);
39971
820d9cd6761a Put doc strings in comments.
Pavel Janík <Pavel@Janik.cz>
parents: 39802
diff changeset
6152
62030
bc82609e1655 (syms_of_buffer): Define cursor-in-non-selected-windows.
Richard M. Stallman <rms@gnu.org>
parents: 61445
diff changeset
6153 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
6154 &current_buffer->cursor_in_non_selected_windows, Qnil,
111123
cc83220d255d Sync docs of cursor-in-non-selected-windows between Lisp and C.
Glenn Morris <rgm@gnu.org>
parents: 110855
diff changeset
6155 doc: /* *Non-nil means show a cursor in non-selected windows.
cc83220d255d Sync docs of cursor-in-non-selected-windows between Lisp and C.
Glenn Morris <rgm@gnu.org>
parents: 110855
diff changeset
6156 If nil, only shows a cursor in the selected window.
cc83220d255d Sync docs of cursor-in-non-selected-windows between Lisp and C.
Glenn Morris <rgm@gnu.org>
parents: 110855
diff changeset
6157 If t, displays a cursor related to the usual cursor type
cc83220d255d Sync docs of cursor-in-non-selected-windows between Lisp and C.
Glenn Morris <rgm@gnu.org>
parents: 110855
diff changeset
6158 \(a solid box becomes hollow, a bar becomes a narrower bar).
cc83220d255d Sync docs of cursor-in-non-selected-windows between Lisp and C.
Glenn Morris <rgm@gnu.org>
parents: 110855
diff changeset
6159 You can also specify the cursor type as in the `cursor-type' variable.
cc83220d255d Sync docs of cursor-in-non-selected-windows between Lisp and C.
Glenn Morris <rgm@gnu.org>
parents: 110855
diff changeset
6160 Use Custom to set this variable and update the display." */);
62030
bc82609e1655 (syms_of_buffer): Define cursor-in-non-selected-windows.
Richard M. Stallman <rms@gnu.org>
parents: 61445
diff changeset
6161
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39974
diff changeset
6162 DEFVAR_LISP ("kill-buffer-query-functions", &Vkill_buffer_query_functions,
74680
a331aebfdf6a (Fkill_buffer): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents: 74595
diff changeset
6163 doc: /* List of functions called with no args to query before killing a buffer.
a331aebfdf6a (Fkill_buffer): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents: 74595
diff changeset
6164 The buffer being killed will be current while the functions are running.
a331aebfdf6a (Fkill_buffer): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents: 74595
diff changeset
6165 If any of them returns nil, the buffer is not killed. */);
6051
0b144d967f30 (Fkill_buffer): Call the Vkill_buffer_query_functions.
Richard M. Stallman <rms@gnu.org>
parents: 5904
diff changeset
6166 Vkill_buffer_query_functions = Qnil;
0b144d967f30 (Fkill_buffer): Call the Vkill_buffer_query_functions.
Richard M. Stallman <rms@gnu.org>
parents: 5904
diff changeset
6167
72299
e97bfa736263 * buffer.c (Vchange_major_mode_hook, Qchange_major_mode_hook): New vars.
Chong Yidong <cyd@stupidchicken.com>
parents: 71968
diff changeset
6168 DEFVAR_LISP ("change-major-mode-hook", &Vchange_major_mode_hook,
e97bfa736263 * buffer.c (Vchange_major_mode_hook, Qchange_major_mode_hook): New vars.
Chong Yidong <cyd@stupidchicken.com>
parents: 71968
diff changeset
6169 doc: /* Normal hook run before changing the major mode of a buffer.
e97bfa736263 * buffer.c (Vchange_major_mode_hook, Qchange_major_mode_hook): New vars.
Chong Yidong <cyd@stupidchicken.com>
parents: 71968
diff changeset
6170 The function `kill-all-local-variables' runs this before doing anything else. */);
e97bfa736263 * buffer.c (Vchange_major_mode_hook, Qchange_major_mode_hook): New vars.
Chong Yidong <cyd@stupidchicken.com>
parents: 71968
diff changeset
6171 Vchange_major_mode_hook = Qnil;
105877
21bdda3ded62 * xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105669
diff changeset
6172 Qchange_major_mode_hook = intern_c_string ("change-major-mode-hook");
72299
e97bfa736263 * buffer.c (Vchange_major_mode_hook, Qchange_major_mode_hook): New vars.
Chong Yidong <cyd@stupidchicken.com>
parents: 71968
diff changeset
6173 staticpro (&Qchange_major_mode_hook);
e97bfa736263 * buffer.c (Vchange_major_mode_hook, Qchange_major_mode_hook): New vars.
Chong Yidong <cyd@stupidchicken.com>
parents: 71968
diff changeset
6174
14506
bddd8114eaa9 (Fbuffer_live_p): New function.
Richard M. Stallman <rms@gnu.org>
parents: 14481
diff changeset
6175 defsubr (&Sbuffer_live_p);
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
6176 defsubr (&Sbuffer_list);
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
6177 defsubr (&Sget_buffer);
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
6178 defsubr (&Sget_file_buffer);
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
6179 defsubr (&Sget_buffer_create);
10314
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
6180 defsubr (&Smake_indirect_buffer);
392
dce611246f59 *** empty log message ***
Roland McGrath <roland@gnu.org>
parents: 333
diff changeset
6181 defsubr (&Sgenerate_new_buffer_name);
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
6182 defsubr (&Sbuffer_name);
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
6183 /*defsubr (&Sbuffer_number);*/
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
6184 defsubr (&Sbuffer_file_name);
10314
b5260fe3dfdd (Fmake_indirect_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10253
diff changeset
6185 defsubr (&Sbuffer_base_buffer);
40725
a8af2e89346c (Fbuffer_local_value): New function.
Richard M. Stallman <rms@gnu.org>
parents: 40656
diff changeset
6186 defsubr (&Sbuffer_local_value);
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
6187 defsubr (&Sbuffer_local_variables);
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
6188 defsubr (&Sbuffer_modified_p);
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
6189 defsubr (&Sset_buffer_modified_p);
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
6190 defsubr (&Sbuffer_modified_tick);
72592
f6de516bbb4b * buffer.h (struct buffer_text): New field chars_modiff.
Chong Yidong <cyd@stupidchicken.com>
parents: 72532
diff changeset
6191 defsubr (&Sbuffer_chars_modified_tick);
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
6192 defsubr (&Srename_buffer);
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
6193 defsubr (&Sother_buffer);
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
6194 defsubr (&Sbuffer_enable_undo);
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
6195 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
6196 defsubr (&Sset_buffer_major_mode);
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
6197 defsubr (&Sswitch_to_buffer);
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
6198 defsubr (&Scurrent_buffer);
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
6199 defsubr (&Sset_buffer);
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
6200 defsubr (&Sbarf_if_buffer_read_only);
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
6201 defsubr (&Sbury_buffer);
20679
a9d566444dd4 (Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20586
diff changeset
6202 defsubr (&Serase_buffer);
92215
4a11735d1bdb (Fbuffer_swap_text): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 91781
diff changeset
6203 defsubr (&Sbuffer_swap_text);
20679
a9d566444dd4 (Fset_buffer_multibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20586
diff changeset
6204 defsubr (&Sset_buffer_multibyte);
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
6205 defsubr (&Skill_all_local_variables);
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
6206
2776
8bf3bb4c20dd * lisp.h (Lisp_Overlay): New tag.
Jim Blandy <jimb@redhat.com>
parents: 2722
diff changeset
6207 defsubr (&Soverlayp);
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
6208 defsubr (&Smake_overlay);
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
6209 defsubr (&Sdelete_overlay);
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
6210 defsubr (&Smove_overlay);
2787
995c6e665599 * buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents: 2776
diff changeset
6211 defsubr (&Soverlay_start);
995c6e665599 * buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents: 2776
diff changeset
6212 defsubr (&Soverlay_end);
995c6e665599 * buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents: 2776
diff changeset
6213 defsubr (&Soverlay_buffer);
995c6e665599 * buffer.c (Foverlay_start, Foverlay_end, Foverlay_buffer,
Jim Blandy <jimb@redhat.com>
parents: 2776
diff changeset
6214 defsubr (&Soverlay_properties);
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
6215 defsubr (&Soverlays_at);
12382
63c03173db06 (overlays_in): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12354
diff changeset
6216 defsubr (&Soverlays_in);
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
6217 defsubr (&Snext_overlay_change);
8967
80b92977ed08 (overlays_at): New arg PREV_PTR.
Richard M. Stallman <rms@gnu.org>
parents: 8924
diff changeset
6218 defsubr (&Sprevious_overlay_change);
2389
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
6219 defsubr (&Soverlay_recenter);
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
6220 defsubr (&Soverlay_lists);
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
6221 defsubr (&Soverlay_get);
6048be0eedcd (init_buffer_once, reset_buffer):
Richard M. Stallman <rms@gnu.org>
parents: 2217
diff changeset
6222 defsubr (&Soverlay_put);
28518
5da961b04d97 (Frestore_buffer_modified_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28417
diff changeset
6223 defsubr (&Srestore_buffer_modified_p);
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
6224 }
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
6225
21514
fa9ff387d260 Fix -Wimplicit warnings.
Andreas Schwab <schwab@suse.de>
parents: 21506
diff changeset
6226 void
109144
7dceae91724c Convert most remaining function definitions to standard C.
Juanma Barranquero <lekktu@gmail.com>
parents: 109100
diff changeset
6227 keys_of_buffer (void)
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
6228 {
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
6229 initial_define_key (control_x_map, 'b', "switch-to-buffer");
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
6230 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
6231
2c5f3537a1cc (syms_of_buffer): Don't do (put 'erase-buffer 'disabled t) here.
Roland McGrath <roland@gnu.org>
parents: 5502
diff changeset
6232 /* 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
6233 initialized when that function gets called. */
105877
21bdda3ded62 * xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105669
diff changeset
6234 Fput (intern_c_string ("erase-buffer"), Qdisabled, Qt);
333
885bf0750dbb Initial revision
Roland McGrath <roland@gnu.org>
parents:
diff changeset
6235 }
52401
695cf19ef79e Add arch taglines
Miles Bader <miles@gnu.org>
parents: 52253
diff changeset
6236