Mercurial > hg > xemacs-beta
view src/conslots.h @ 5552:85210c453a97
Fix performance regression in refactored syntax cache setup.
More doc improvements.
* syntax.h (enum syntax_source):
New. Specify whether syntax is from property or buffer.
(struct syntax_cache):
Use enum syntax_source source, instead of no_syntax_table_prop
and use_code.
Improve comments.
(SOURCE_IS_TABLE):
New predicate.
(SYNTAX_CODE_FROM_CACHE):
Use it instead of use_code, and adjust logic.
* syntax.c (syntax_cache_table_was_changed):
Check cache->source (cache->no_syntax_table_prop is gone).
(reset_syntax_cache_range):
All information about OBJECT and BUFFER is in CACHE already.
Also reset markers in OBJECT if it is a buffer.
Rename INFINITE to VALID_EVERYWHERE.
(init_syntax_cache):
Initialize source (cache->no_syntax_table_prop is gone).
Maybe initialize start and end to null markers.
Initialize cache range with reset_syntax_cache_range.
(update_syntax_cache):
Use source instead of no_syntax_table_prop and use_code.
(setup_syntax_cache):
Add header comment. Improve other comments.
Make calls to reset_syntax_cache_range and init_syntax_cache match
their prototypes.
(init_buffer_syntax_cache):
Use init_syntax_cache to do the work.
(signal_syntax_cache_extent_changed):
Make call to reset_syntax_cache_range match its prototype.
Improve local variable naming.
author | Stephen J. Turnbull <stephen@xemacs.org> |
---|---|
date | Tue, 23 Aug 2011 04:41:45 +0900 |
parents | 308d34e9f07d |
children |
line wrap: on
line source
/* Definitions of marked slots in consoles Copyright (C) 1990, 1992, 1993 Free Software Foundation, Inc. Copyright (C) 2002 Ben Wing. This file is part of XEmacs. XEmacs is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. XEmacs is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */ /* Synched up with: Mule 2.0, FSF 19.30. (see FSF keyboard.h.) */ /* We define the Lisp_Objects in the console structure in a separate file because there are numerous places we want to iterate over them, such as when defining them in the structure, initializing them, or marking them. To use, define MARKED_SLOT before including this file. No need to undefine; that happens automatically. */ #ifndef CONSOLE_SLOTS_FIRST_NAME #define CONSOLE_SLOTS_FIRST_NAME name #endif /* Name of this console, for resourcing and printing purposes. If not explicitly given, it's initialized in a console-specific manner. */ MARKED_SLOT (name) /* What this console is connected to */ MARKED_SLOT (connection) /* A canonical name for the connection that is used to determine whether create_console() is being called on an existing console. */ MARKED_SLOT (canon_connection) /* List of devices on this console. */ MARKED_SLOT (device_list) /* Currently selected device. */ MARKED_SLOT (selected_device) /* Most-recently-selected non-minibuffer-only frame. Always the same as the selected frame, unless that's a minibuffer-only frame. */ MARKED_SLOT (last_nonminibuf_frame) /* If non-nil, a keymap that overrides all others but applies only to this console. Lisp code that uses this instead of calling next-event can effectively wait for input in the any-console state, and hence avoid blocking out the other consoles. See universal-argument in lisp/simple.el for an example. #### This comes from FSF Emacs; but there's probably a better solution that involves making next-event itself work over all consoles. */ MARKED_SLOT (overriding_terminal_local_map) /* Last command executed by the editor command loop, not counting commands that set the prefix argument. */ MARKED_SLOT (last_command) /* The prefix argument for the next command, in raw form. */ MARKED_SLOT (prefix_arg) /* Where information about a partially completed key sequence is kept. */ MARKED_SLOT (command_builder) /* Non-nil while a kbd macro is being defined. */ MARKED_SLOT (defining_kbd_macro) /* This is a lisp vector, which contains the events of the keyboard macro currently being read. It is reallocated when the macro gets too large. */ MARKED_SLOT (kbd_macro_builder) /* Last anonymous kbd macro defined. */ MARKED_SLOT (last_kbd_macro) #ifdef HAVE_TTY /* ERASE character from stty settings. */ MARKED_SLOT (tty_erase_char) #endif /* Key that invokes QUIT. */ MARKED_SLOT (quit_char) /* Event version of quit-char. */ MARKED_SLOT (quit_event) /* Event version of critical QUIT (upshifted quit-char). */ MARKED_SLOT (critical_quit_event) /* Minibufferless frames on this console use this frame's minibuffer. */ MARKED_SLOT (default_minibuffer_frame) /* Keymap mapping ASCII function key sequences onto their preferred forms. Initialized by the terminal-specific lisp files. */ MARKED_SLOT (function_key_map) #ifndef CONSOLE_SLOTS_LAST_NAME #define CONSOLE_SLOTS_LAST_NAME function_key_map #endif #undef MARKED_SLOT