Mercurial > hg > xemacs-beta
annotate src/bufslots.h @ 5353:38e24b8be4ea
Improve the lexical scoping in #'block, #'return-from.
lisp/ChangeLog addition:
2011-02-07 Aidan Kehoe <kehoea@parhasard.net>
* bytecomp.el:
* bytecomp.el (byte-compile-initial-macro-environment):
Shadow `block', `return-from' here, we implement them differently
when byte-compiling.
* bytecomp.el (byte-compile-active-blocks): New.
* bytecomp.el (byte-compile-block-1): New.
* bytecomp.el (byte-compile-return-from-1): New.
* bytecomp.el (return-from-1): New.
* bytecomp.el (block-1): New.
These are two aliases that exist to have their own associated
byte-compile functions, which functions implement `block' and
`return-from'.
* cl-extra.el (cl-macroexpand-all):
Fix a bug here when macros in the environment have been compiled.
* cl-macs.el (block):
* cl-macs.el (return):
* cl-macs.el (return-from):
Be more careful about lexical scope in these macros.
* cl.el:
* cl.el ('cl-block-wrapper): Removed.
* cl.el ('cl-block-throw): Removed.
These aren't needed in code generated by this XEmacs. They
shouldn't be needed in code generated by XEmacs 21.4, but if it
turns out the packages do need them, we can put them back.
2011-01-30 Mike Sperber <mike@xemacs.org>
* font-lock.el (font-lock-fontify-pending-extents): Don't fail if
`font-lock-mode' is unset, which can happen in the middle of
`revert-buffer'.
2011-01-23 Aidan Kehoe <kehoea@parhasard.net>
* cl-macs.el (delete):
* cl-macs.el (delq):
* cl-macs.el (remove):
* cl-macs.el (remq):
Don't use the compiler macro if these functions were given the
wrong number of arguments, as happens in lisp-tests.el.
* cl-seq.el (remove, remq): Removed.
I added these to subr.el, and forgot to remove them from here.
2011-01-22 Aidan Kehoe <kehoea@parhasard.net>
* bytecomp.el (byte-compile-setq, byte-compile-set):
Remove kludge allowing keywords' values to be set, all the code
that does that is gone.
* cl-compat.el (elt-satisfies-test-p):
* faces.el (set-face-parent):
* faces.el (face-doc-string):
* gtk-font-menu.el:
* gtk-font-menu.el (gtk-reset-device-font-menus):
* msw-font-menu.el:
* msw-font-menu.el (mswindows-reset-device-font-menus):
* package-get.el (package-get-installedp):
* select.el (select-convert-from-image-data):
* sound.el:
* sound.el (load-sound-file):
* x-font-menu.el (x-reset-device-font-menus-core):
Don't quote keywords, they're self-quoting, and the
win from backward-compatibility is sufficiently small now that the
style problem overrides it.
2011-01-22 Aidan Kehoe <kehoea@parhasard.net>
* cl-macs.el (block, return-from): Require that NAME be a symbol
in these macros, as always documented in the #'block docstring and
as required by Common Lisp.
* descr-text.el (unidata-initialize-unihan-database):
Correct the use of non-symbols in #'block and #'return-from in
this function.
2011-01-15 Aidan Kehoe <kehoea@parhasard.net>
* cl-extra.el (concatenate): Accept more complicated TYPEs in this
function, handing the sequences over to #'coerce if we don't
understand them here.
* cl-macs.el (inline): Don't proclaim #'concatenate as inline, its
compiler macro is more useful than doing that.
2011-01-11 Aidan Kehoe <kehoea@parhasard.net>
* subr.el (delete, delq, remove, remq): Move #'remove, #'remq
here, they don't belong in cl-seq.el; move #'delete, #'delq here
from fns.c, implement them in terms of #'delete*, allowing support
for sequences generally.
* update-elc.el (do-autoload-commands): Use #'delete*, not #'delq
here, now the latter's no longer dumped.
* cl-macs.el (delete, delq): Add compiler macros transforming
#'delete and #'delq to #'delete* calls.
2011-01-10 Aidan Kehoe <kehoea@parhasard.net>
* dialog.el (make-dialog-box): Correct a misplaced parenthesis
here, thank you Mats Lidell in 87zkr9gqrh.fsf@mail.contactor.se !
2011-01-02 Aidan Kehoe <kehoea@parhasard.net>
* dialog.el (make-dialog-box):
* list-mode.el (display-completion-list):
These functions used to use cl-parsing-keywords; change them to
use defun* instead, fixing the build. (Not sure what led to me
not including this change in d1b17a33450b!)
2011-01-02 Aidan Kehoe <kehoea@parhasard.net>
* cl-macs.el (define-star-compiler-macros):
Make sure the form has ITEM and LIST specified before attempting
to change to calls with explicit tests; necessary for some tests
in lisp-tests.el to compile correctly.
(stable-union, stable-intersection): Add compiler macros for these
functions, in the same way we do for most of the other functions
in cl-seq.el.
2011-01-01 Aidan Kehoe <kehoea@parhasard.net>
* cl-macs.el (dolist, dotimes, do-symbols, macrolet)
(symbol-macrolet):
Define these macros with defmacro* instead of parsing the argument
list by hand, for the sake of style and readability; use backquote
where appropriate, instead of calling #'list and and friends, for
the same reason.
2010-12-30 Aidan Kehoe <kehoea@parhasard.net>
* x-misc.el (device-x-display):
Provide this function, documented in the Lispref for years, but
not existing previously. Thank you Julian Bradfield, thank you
Jeff Mincy.
2010-12-30 Aidan Kehoe <kehoea@parhasard.net>
* cl-seq.el:
Move the heavy lifting from this file to C. Dump the
cl-parsing-keywords macro, but don't use defun* for the functions
we define that do take keywords, dynamic scope lossage makes that
not practical.
* subr.el (sort, fillarray): Move these aliases here.
(map-plist): #'nsublis is now built-in, but at this point #'eql
isn't necessarily available as a test; use #'eq.
* obsolete.el (cl-delete-duplicates): Make this available for old
compiler macros and old code.
(memql): Document that this is equivalent to #'member*, and worse.
* cl.el (adjoin, subst): Removed. These are in C.
2010-12-30 Aidan Kehoe <kehoea@parhasard.net>
* simple.el (assoc-ignore-case): Remove a duplicate definition of
this function (it's already in subr.el).
* iso8859-1.el (char-width):
On non-Mule, make this function equivalent to that produced by
(constantly 1), but preserve its docstring.
* subr.el (subst-char-in-string): Define this in terms of
#'substitute, #'nsubstitute.
(string-width): Define this using #'reduce and #'char-width.
(char-width): Give this a simpler definition, it makes far more
sense to check for mule at load time and redefine, as we do in
iso8859-1.el.
(store-substring): Implement this in terms of #'replace, now
#'replace is cheap.
2010-12-30 Aidan Kehoe <kehoea@parhasard.net>
* update-elc.el (lisp-files-needed-for-byte-compilation)
(lisp-files-needing-early-byte-compilation):
cl-macs belongs in the former, not the latter, it is as
fundamental as bytecomp.el.
2010-12-30 Aidan Kehoe <kehoea@parhasard.net>
* cl.el:
Provde the Common Lisp program-error, type-error as error
symbols. This doesn't nearly go far enough for anyone using the
Common Lisp errors.
2010-12-29 Aidan Kehoe <kehoea@parhasard.net>
* cl-macs.el (delete-duplicates):
If the form has an incorrect number of arguments, don't attempt a
compiler macroexpansion.
2010-12-29 Aidan Kehoe <kehoea@parhasard.net>
* cl-macs.el (cl-safe-expr-p):
Forms that start with the symbol lambda are also safe.
2010-12-29 Aidan Kehoe <kehoea@parhasard.net>
* cl-macs.el (= < > <= >=):
For these functions' compiler macros, the optimisation is safe
even if the first and the last arguments have side effects, since
they're only used the once.
2010-12-29 Aidan Kehoe <kehoea@parhasard.net>
* cl-macs.el (inline-side-effect-free-compiler-macros):
Unroll a loop here at macro-expansion time, so these compiler
macros are compiled. Use #'eql instead of #'eq in a couple of
places for better style.
2010-12-29 Aidan Kehoe <kehoea@parhasard.net>
* cl-extra.el (notany, notevery): Avoid some dynamic scope
stupidity with local variable names in these functions, when they
weren't prefixed with cl-; go into some more detail in the doc
strings.
2010-12-29 Aidan Kehoe <kehoea@parhasard.net>
* byte-optimize.el (side-effect-free-fns): #'remove, #'remq are
free of side-effects.
(side-effect-and-error-free-fns):
Drop dot, dot-marker from the list.
2010-11-17 Aidan Kehoe <kehoea@parhasard.net>
* cl-extra.el (coerce):
In the argument list, name the first argument OBJECT, not X; the
former name was always used in the doc string and is clearer.
Handle vector type specifications which include the length of the
target sequence, error if there's a mismatch.
* cl-macs.el (cl-make-type-test): Handle type specifications
starting with the symbol 'eql.
2010-11-14 Aidan Kehoe <kehoea@parhasard.net>
* cl-macs.el (eql): Don't remove the byte-compile property of this
symbol. That was necessary to override a bug in bytecomp.el where
#'eql was confused with #'eq, which bug we no longer have.
If neither expression is constant, don't attempt to handle the
expression in this compiler macro, leave it to byte-compile-eql,
which produces better code anyway.
* bytecomp.el (eq): #'eql is not the function associated with the
byte-eq byte code.
(byte-compile-eql): Add an explicit compile method for this
function, for cases where the cl-macs compiler macro hasn't
reduced it to #'eq or #'equal.
2010-10-25 Aidan Kehoe <kehoea@parhasard.net>
Add compiler macros and compilation sanity-checking for various
functions that take keywords.
* byte-optimize.el (side-effect-free-fns): #'symbol-value is
side-effect free and not error free.
* bytecomp.el (byte-compile-normal-call): Check keyword argument
lists for sanity; store information about the positions where
keyword arguments start using the new byte-compile-keyword-start
property.
* cl-macs.el (cl-const-expr-val): Take a new optional argument,
cl-not-constant, defaulting to nil, in this function; return it if
the expression is not constant.
(cl-non-fixnum-number-p): Make this into a separate function, we
want to pass it to #'every.
(eql): Use it.
(define-star-compiler-macros): Use the same code to generate the
member*, assoc* and rassoc* compiler macros; special-case some
code in #'add-to-list in subr.el.
(remove, remq): Add compiler macros for these two functions, in
preparation for #'remove being in C.
(define-foo-if-compiler-macros): Transform (remove-if-not ...) calls to
(remove ... :if-not) at compile time, which will be a real win
once the latter is in C.
(define-substitute-if-compiler-macros)
(define-subst-if-compiler-macros): Similarly for these functions.
(delete-duplicates): Change this compiler macro to use
#'plists-equal; if we don't have information about the type of
SEQUENCE at compile time, don't bother attempting to inline the
call, the function will be in C soon enough.
(equalp): Remove an old commented-out compiler macro for this, if
we want to see it it's in version control.
(subst-char-in-string): Transform this to a call to nsubstitute or
nsubstitute, if that is appropriate.
* cl.el (ldiff): Don't call setf here, this makes for a load-time
dependency problem in cl-macs.el
2010-06-14 Stephen J. Turnbull <stephen@xemacs.org>
* term/vt100.el:
Refer to XEmacs, not GNU Emacs, in permissions.
* term/bg-mouse.el:
* term/sup-mouse.el:
Put copyright notice in canonical "Copyright DATE AUTHOR" form.
Refer to XEmacs, not GNU Emacs, in permissions.
* site-load.el:
Add permission boilerplate.
* mule/canna-leim.el:
* alist.el:
Refer to XEmacs, not APEL/this program, in permissions.
* mule/canna-leim.el:
Remove my copyright, I've assigned it to the FSF.
2010-06-14 Stephen J. Turnbull <stephen@xemacs.org>
* gtk.el:
* gtk-widget-accessors.el:
* gtk-package.el:
* gtk-marshal.el:
* gtk-compose.el:
* gnome.el:
Add copyright notice based on internal evidence.
2010-06-14 Stephen J. Turnbull <stephen@xemacs.org>
* easymenu.el: Add reference to COPYING to permission notice.
* gutter.el:
* gutter-items.el:
* menubar-items.el:
Fix typo "Xmacs" in permissions notice.
2010-06-14 Stephen J. Turnbull <stephen@xemacs.org>
* auto-save.el:
* font.el:
* fontconfig.el:
* mule/kinsoku.el:
Add "part of XEmacs" text to permission notice.
2010-10-14 Aidan Kehoe <kehoea@parhasard.net>
* byte-optimize.el (side-effect-free-fns):
* cl-macs.el (remf, getf):
* cl-extra.el (tailp, cl-set-getf, cl-do-remf):
* cl.el (ldiff, endp):
Tighten up Common Lisp compatibility for #'ldiff, #'endp, #'tailp;
add circularity checking for the first two.
#'cl-set-getf and #'cl-do-remf were Lisp implementations of
#'plist-put and #'plist-remprop; change the names to aliases,
changes the macros that use them to using #'plist-put and
#'plist-remprop directly.
2010-10-12 Aidan Kehoe <kehoea@parhasard.net>
* abbrev.el (fundamental-mode-abbrev-table, global-abbrev-table):
Create both these abbrev tables using the usual
#'define-abbrev-table calls, rather than attempting to
special-case them.
* cl-extra.el: Force cl-macs to be loaded here, if cl-extra.el is
being loaded interpreted. Previously other, later files would
redundantly call (load "cl-macs") when interpreted, it's more
reasonable to do it here, once.
* cmdloop.el (read-quoted-char-radix): Use defcustom here, we
don't have any dump-order dependencies that would prevent that.
* custom.el (eval-when-compile): Don't load cl-macs when
interpreted or when byte-compiling, rely on cl-extra.el in the
former case and the appropriate entry in bytecomp-load-hook in the
latter. Get rid of custom-declare-variable-list, we have no
dump-time dependencies that would require it.
* faces.el (eval-when-compile): Don't load cl-macs when
interpreted or when byte-compiling.
* packages.el: Remove some inaccurate comments.
* post-gc.el (cleanup-simple-finalizers): Use #'delete-if-not
here, now the order of preloaded-file-list has been changed to
make it available.
* subr.el (custom-declare-variable-list): Remove. No need for it.
Also remove a stub define-abbrev-table from this file, given the
current order of preloaded-file-list there's no need for it.
2010-10-10 Aidan Kehoe <kehoea@parhasard.net>
* bytecomp.el (byte-compile-constp) Forms quoted with FUNCTION are
also constant.
(byte-compile-initial-macro-environment): In #'the, if FORM is
constant and does not match TYPE, warn at byte-compile time.
2010-10-10 Aidan Kehoe <kehoea@parhasard.net>
* backquote.el (bq-vector-contents, bq-list*): Remove; the former
is equivalent to (append VECTOR nil), the latter to (list* ...).
(bq-process-2): Use (append VECTOR nil) instead of using
#'bq-vector-contents to convert to a list.
(bq-process-1): Now we use list* instead of bq-list
* subr.el (list*): Moved from cl.el, since it is now required to
be available the first time a backquoted form is encountered.
* cl.el (list*): Move to subr.el.
2010-09-16 Aidan Kehoe <kehoea@parhasard.net>
* test-harness.el (Check-Message):
Add an omitted comma here, thank you the buildbot.
2010-09-16 Aidan Kehoe <kehoea@parhasard.net>
* hash-table.el (hash-table-key-list, hash-table-value-list)
(hash-table-key-value-alist, hash-table-key-value-plist):
Remove some useless #'nreverse calls in these files; our hash
tables have no order, it's not helpful to pretend they do.
* behavior.el (read-behavior):
Do the same in this file, in some code evidently copied from
hash-table.el.
2010-09-16 Aidan Kehoe <kehoea@parhasard.net>
* info.el (Info-insert-dir):
* format.el (format-deannotate-region):
* files.el (cd, save-buffers-kill-emacs):
Use #'some, #'every and related functions for applying boolean
operations to lists, instead of rolling our own ones that cons and
don't short-circuit.
2010-09-16 Aidan Kehoe <kehoea@parhasard.net>
* bytecomp.el (byte-compile-initial-macro-environment):
* cl-macs.el (the):
Rephrase the docstring, make its implementation when compiling
files a little nicer.
2010-09-16 Aidan Kehoe <kehoea@parhasard.net>
* descr-text.el (unidata-initialize-unicodedata-database)
(unidata-initialize-unihan-database, describe-char-unicode-data)
(describe-char-unicode-data):
Wrap calls to the database functions with (with-fboundp ...),
avoiding byte compile warnings on builds without support for the
database functions.
(describe-char): (reduce #'max ...), not (apply #'max ...), no
need to cons needlessly.
(describe-char): Remove a redundant lambda wrapping
#'extent-properties.
(describe-char-unicode-data): Call #'nsubst when replacing "" with
nil in the result of #'split-string, instead of consing inside
mapcar.
2010-09-16 Aidan Kehoe <kehoea@parhasard.net>
* x-faces.el (x-available-font-sizes):
* specifier.el (let-specifier):
* package-ui.el (pui-add-required-packages):
* msw-faces.el (mswindows-available-font-sizes):
* modeline.el (modeline-minor-mode-menu):
* minibuf.el (minibuf-directory-files):
Replace the O2N (delq nil (mapcar (lambda (W) (and X Y)) Z)) with
the ON (mapcan (lambda (W) (and X (list Y))) Z) in these files.
2010-09-16 Aidan Kehoe <kehoea@parhasard.net>
* cl-macs.el (= < > <= >=):
When these functions are handed more than two arguments, and those
arguments have no side effects, transform to a series of two
argument calls, avoiding funcall in the byte-compiled code.
* mule/mule-cmds.el (finish-set-language-environment):
Take advantage of this change in a function called 256 times at
startup.
2010-09-16 Aidan Kehoe <kehoea@parhasard.net>
* bytecomp.el (byte-compile-function-form, byte-compile-quote)
(byte-compile-quote-form):
Warn at compile time, and error at runtime, if a (quote ...) or a
(function ...) form attempts to quote more than one object.
2010-09-16 Aidan Kehoe <kehoea@parhasard.net>
* byte-optimize.el (byte-optimize-apply): Transform (apply 'nconc
(mapcar ...)) to (mapcan ...); warn about use of the first idiom.
* update-elc.el (do-autoload-commands):
* packages.el (packages-find-package-library-path):
* frame.el (frame-list):
* extents.el (extent-descendants):
* etags.el (buffer-tag-table-files):
* dumped-lisp.el (preloaded-file-list):
* device.el (device-list):
* bytecomp-runtime.el (proclaim-inline, proclaim-notinline)
Use #'mapcan, not (apply #'nconc (mapcar ...) in all these files.
* bytecomp-runtime.el (eval-when-compile, eval-and-compile):
In passing, mention that these macros also evaluate the body when
interpreted.
tests/ChangeLog addition:
2011-02-07 Aidan Kehoe <kehoea@parhasard.net>
* automated/lisp-tests.el:
Test lexical scope for `block', `return-from'; add a
Known-Bug-Expect-Failure for a contorted example that fails when
byte-compiled.
| author | Aidan Kehoe <kehoea@parhasard.net> |
|---|---|
| date | Mon, 07 Feb 2011 12:01:24 +0000 |
| parents | 0b4d355771bd |
| children | 308d34e9f07d |
| rev | line source |
|---|---|
| 428 | 1 /* Definitions of marked slots in buffers |
| 2 Copyright (C) 1990, 1992, 1993 Free Software Foundation, Inc. | |
| 1204 | 3 Copyright (C) 2001, 2002 Ben Wing. |
| 428 | 4 |
| 5 This file is part of XEmacs. | |
| 6 | |
| 7 XEmacs is free software; you can redistribute it and/or modify it | |
| 8 under the terms of the GNU General Public License as published by the | |
| 9 Free Software Foundation; either version 2, or (at your option) any | |
| 10 later version. | |
| 11 | |
| 12 XEmacs is distributed in the hope that it will be useful, but WITHOUT | |
| 13 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
| 14 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
| 15 for more details. | |
| 16 | |
| 17 You should have received a copy of the GNU General Public License | |
| 18 along with XEmacs; see the file COPYING. If not, write to | |
| 19 the Free Software Foundation, Inc., 59 Temple Place - Suite 330, | |
| 20 Boston, MA 02111-1307, USA. */ | |
| 21 | |
| 22 /* Synched up with: Mule 2.0, FSF 19.30. Split out of buffer.h. */ | |
| 23 | |
| 24 /* Authorship: | |
| 25 | |
| 26 FSF: long ago (part of buffer.h). | |
| 27 JWZ: separated out from buffer.h, early in Lemacs. | |
| 28 XEmacs: a few other changes. | |
| 29 */ | |
| 30 | |
| 617 | 31 /* We define the Lisp_Objects in the buffer structure in a separate file |
| 32 because there are numerous places we want to iterate over them, such | |
| 33 as when defining them in the structure, initializing them, or marking | |
| 34 them. | |
| 35 | |
| 36 To use, define MARKED_SLOT before including this file. No need to | |
| 37 undefine; that happens automatically. */ | |
| 428 | 38 |
| 39 #ifndef BUFFER_SLOTS_FIRST_NAME | |
| 40 #define BUFFER_SLOTS_FIRST_NAME name | |
| 41 #endif | |
| 42 | |
| 43 /* The name of this buffer. */ | |
| 1204 | 44 MARKED_SLOT (name) |
| 428 | 45 |
| 46 /* The name of the file visited in this buffer, or nil. */ | |
| 1204 | 47 MARKED_SLOT (filename) |
| 428 | 48 |
| 49 /* Dir for expanding relative file names. */ | |
| 1204 | 50 MARKED_SLOT (directory) |
| 428 | 51 |
| 52 /* True iff this buffer has been backed up (if you write to the | |
| 53 visited file and it hasn't been backed up, then a backup will | |
| 54 be made). */ | |
| 55 /* #### This isn't really used by the C code, so could be deleted. */ | |
| 1204 | 56 MARKED_SLOT (backed_up) |
| 428 | 57 |
| 58 /* Length of file when last read or saved. | |
| 59 This is not in the struct buffer_text | |
| 60 because it's not used in indirect buffers at all. */ | |
| 1204 | 61 MARKED_SLOT (saved_size) |
| 428 | 62 |
| 63 /* File name used for auto-saving this buffer. | |
| 64 This is not in the struct buffer_text | |
| 65 because it's not used in indirect buffers at all. */ | |
| 1204 | 66 MARKED_SLOT (auto_save_file_name) |
| 428 | 67 |
| 68 /* Non-nil if buffer read-only. */ | |
| 1204 | 69 MARKED_SLOT (read_only) |
| 428 | 70 |
| 71 /* "The mark". This is a marker which may | |
| 72 point into this buffer or may point nowhere. */ | |
| 1204 | 73 MARKED_SLOT (mark) |
| 428 | 74 |
| 75 /* Alist of elements (SYMBOL . VALUE-IN-THIS-BUFFER) | |
| 76 for all per-buffer variables of this buffer. | |
| 77 Specifically, this lists those variables that have | |
| 78 a buffer-local value in this buffer: i.e. those | |
| 79 whose value does not shadow the default value. | |
| 80 (Remember that for any particular variable created | |
| 81 with `make-local-variable' or `make-variable-buffer-local', | |
| 82 it will have a per-buffer value in some buffers and a | |
| 83 default value in others.) | |
| 84 | |
| 85 Variables declared in C with DEFVAR_BUFFER_LOCAL() (i.e. | |
| 86 those stored in the struct buffer) are not listed here. */ | |
| 1204 | 87 MARKED_SLOT (local_var_alist) |
| 428 | 88 |
| 89 /* Symbol naming major mode (eg, lisp-mode). */ | |
| 1204 | 90 MARKED_SLOT (major_mode) |
| 428 | 91 |
| 92 /* Pretty name of major mode (eg, "Lisp"). */ | |
| 1204 | 93 MARKED_SLOT (mode_name) |
| 428 | 94 |
| 95 /* Modeline element that controls format of modeline. */ | |
| 1204 | 96 MARKED_SLOT (modeline_format) |
| 428 | 97 |
| 98 /* Keys that are bound local to this buffer. */ | |
| 1204 | 99 MARKED_SLOT (keymap) |
| 428 | 100 |
| 101 /* This buffer's local abbrev table. */ | |
| 1204 | 102 MARKED_SLOT (abbrev_table) |
| 428 | 103 /* This buffer's syntax table. */ |
| 1204 | 104 MARKED_SLOT (syntax_table) |
| 428 | 105 /* Massaged values from the syntax table, for faster lookup. */ |
| 1204 | 106 MARKED_SLOT (mirror_syntax_table) |
| 428 | 107 |
| 108 #ifdef MULE | |
| 109 /* This buffer's category table. */ | |
| 1204 | 110 MARKED_SLOT (category_table) |
| 428 | 111 #endif /* MULE */ |
| 112 /* This buffer's coding system. */ | |
| 1204 | 113 MARKED_SLOT (buffer_file_coding_system) |
| 428 | 114 /* Values of several buffer-local variables. |
| 115 | |
| 116 tab-width is buffer-local so that redisplay can find it | |
| 117 in buffers that are not current */ | |
| 1204 | 118 MARKED_SLOT (case_fold_search) |
| 119 MARKED_SLOT (tab_width) | |
| 120 MARKED_SLOT (fill_column) | |
| 121 MARKED_SLOT (left_margin) | |
| 428 | 122 |
| 123 /* Function to call when insert space past fill column. */ | |
| 1204 | 124 MARKED_SLOT (auto_fill_function) |
| 428 | 125 |
| 446 | 126 /* Case table for case-conversion in this buffer. */ |
| 1204 | 127 MARKED_SLOT (case_table) |
| 128 /* It contanis following char-tables: */ | |
| 446 | 129 /* Char-table maps each char into its lower-case version. */ |
| 428 | 130 /* Char-table mapping each char to its upper-case version. */ |
| 131 /* Char-table for conversion for case-folding search. */ | |
| 132 /* Char-table of equivalences for case-folding search. */ | |
| 133 | |
| 134 /* #### This ought to be a specifier: */ | |
| 135 /* Non-nil means do not display continuation lines. */ | |
| 1204 | 136 MARKED_SLOT (truncate_lines) |
| 428 | 137 /* #### This ought to be a specifier: */ |
| 138 /* #### Better yet, it ought to be junked. It really sucks. */ | |
| 139 /* Non-nil means display ctl chars with uparrow. */ | |
| 1204 | 140 MARKED_SLOT (ctl_arrow) |
| 428 | 141 /* #### This ought to be a specifier: */ |
| 142 /* #### Better yet, it ought to be junked. It really sucks. */ | |
| 143 /* Non-nil means do selective display; | |
| 144 see doc string in syms_of_buffer (buffer.c) for details. */ | |
| 1204 | 145 MARKED_SLOT (selective_display) |
| 428 | 146 /* #### This ought to be a specifier: */ |
| 147 /* #### Better yet, it ought to be junked. It really sucks. */ | |
| 148 /* Non-nil means show ... at end of line followed by invisible lines. */ | |
| 1204 | 149 MARKED_SLOT (selective_display_ellipses) |
| 428 | 150 /* Alist of (FUNCTION . STRING) for each minor mode enabled in buffer. */ |
| 1204 | 151 /* Unused: MARKED_SLOT (minor_modes) */ |
| 428 | 152 /* t if "self-insertion" should overwrite */ |
| 1204 | 153 MARKED_SLOT (overwrite_mode) |
| 428 | 154 /* non-nil means abbrev mode is on. Expand abbrevs automatically. */ |
| 1204 | 155 MARKED_SLOT (abbrev_mode) |
| 428 | 156 |
| 157 /* No display table here. It's a specifier. */ | |
| 158 #if 0 /* FSFmacs */ | |
| 159 /* t means the mark and region are currently active. */ | |
| 1204 | 160 MARKED_SLOT (mark_active) |
| 428 | 161 #endif |
| 162 | |
| 163 /* Changes in the buffer are recorded here for undo. | |
| 164 t means don't record anything. | |
| 165 This information belongs to the base buffer of an indirect buffer, | |
| 166 But we can't store it in the struct buffer_text | |
| 167 because local variables have to be right in the struct buffer. | |
| 168 So we copy it around in set_buffer_internal. */ | |
| 1204 | 169 MARKED_SLOT (undo_list) |
| 428 | 170 |
| 171 /* FSFmacs has overlay stuff here. We have extent info elsewhere in the | |
| 172 struct buffer. */ | |
| 173 | |
| 442 | 174 /* dedicated_frame in lisp */ |
| 428 | 175 |
| 176 /* Lisp of symbols naming the file format used for visited file. */ | |
| 1204 | 177 MARKED_SLOT (file_format) |
| 428 | 178 |
| 179 #ifdef REGION_CACHE_NEEDS_WORK | |
| 180 /* True if the newline position cache and width run cache are | |
| 181 enabled. See search.c and indent.c. */ | |
| 1204 | 182 MARKED_SLOT (cache_long_line_scans) |
| 428 | 183 |
| 184 /* If the width run cache is enabled, this table contains the | |
| 185 character widths width_run_cache (see above) assumes. When we | |
| 186 do a thorough redisplay, we compare this against the buffer's | |
| 187 current display table to see whether the display table has | |
| 188 affected the widths of any characters. If it has, we | |
| 189 invalidate the width run cache, and re-initialize width_table. */ | |
| 1204 | 190 MARKED_SLOT (width_table) |
| 428 | 191 #endif /* REGION_CACHE_NEEDS_WORK */ |
| 192 | |
| 193 /* A redundant copy of text.pt, in the form of a marker. Every time one | |
| 194 is updated, so is the other. | |
| 195 */ | |
| 1204 | 196 MARKED_SLOT (point_marker) |
| 428 | 197 |
| 198 /* FSFmacs has pt_marker, begv_marker, zv_marker here, used for | |
| 199 indirect buffers. We don't need them because we handle these | |
| 200 values directly instead of playing games with markers. */ | |
| 201 | |
| 202 /* This holds the point value before the last scroll operation. | |
| 203 Explicitly setting point sets this to nil. */ | |
| 1204 | 204 MARKED_SLOT (point_before_scroll) |
| 428 | 205 |
| 771 | 206 /* Truename of the visited file (via qxe_realpath()), |
| 428 | 207 or nil. */ |
| 1204 | 208 MARKED_SLOT (file_truename) |
| 428 | 209 |
| 210 /* Invisibility spec of this buffer. | |
| 211 t => any non-nil `invisible' property means invisible. | |
| 212 A list => `invisible' property means invisible | |
| 213 if it is memq in that list. */ | |
| 1204 | 214 MARKED_SLOT (invisibility_spec) |
| 428 | 215 |
| 216 /* The string generated by formatting the modeline in this buffer. */ | |
| 1204 | 217 MARKED_SLOT (generated_modeline_string) |
| 428 | 218 |
|
5214
0b4d355771bd
Import buffer-display-count, buffer-display-time; thank you, Jeff Sparkes.
Aidan Kehoe <kehoea@parhasard.net>
parents:
1204
diff
changeset
|
219 /* Incremented each time a buffer is displayed using set-window-buffer. */ |
|
0b4d355771bd
Import buffer-display-count, buffer-display-time; thank you, Jeff Sparkes.
Aidan Kehoe <kehoea@parhasard.net>
parents:
1204
diff
changeset
|
220 MARKED_SLOT (display_count) |
|
0b4d355771bd
Import buffer-display-count, buffer-display-time; thank you, Jeff Sparkes.
Aidan Kehoe <kehoea@parhasard.net>
parents:
1204
diff
changeset
|
221 |
|
0b4d355771bd
Import buffer-display-count, buffer-display-time; thank you, Jeff Sparkes.
Aidan Kehoe <kehoea@parhasard.net>
parents:
1204
diff
changeset
|
222 /* Last time this buffer was displayed using set-window-buffer. */ |
|
0b4d355771bd
Import buffer-display-count, buffer-display-time; thank you, Jeff Sparkes.
Aidan Kehoe <kehoea@parhasard.net>
parents:
1204
diff
changeset
|
223 MARKED_SLOT (display_time) |
|
0b4d355771bd
Import buffer-display-count, buffer-display-time; thank you, Jeff Sparkes.
Aidan Kehoe <kehoea@parhasard.net>
parents:
1204
diff
changeset
|
224 |
| 428 | 225 /* A hash table that maps from a "generic extent" (an extent in |
| 226 `modeline-format') into a buffer-specific extent. */ | |
| 1204 | 227 MARKED_SLOT (modeline_extent_table) |
| 428 | 228 |
| 229 #ifndef BUFFER_SLOTS_LAST_NAME | |
| 230 #define BUFFER_SLOTS_LAST_NAME modeline_extent_table | |
| 231 #endif | |
| 232 | |
| 617 | 233 #undef MARKED_SLOT |