Mercurial > hg > xemacs-beta
view src/keymap-slots.h @ 5277:d804e621add0
Simplify the API of PARSE_KEYWORDS for callers.
src/ChangeLog addition:
2010-09-18 Aidan Kehoe <kehoea@parhasard.net>
Simplify the API of PARSE_KEYWORDS for callers.
* lisp.h (PARSE_KEYWORDS): Simply the API, while making the
implementation a little more complex; work out KEYWORDS_OFFSET
from the appropriate Lisp_Subr struct, take the function name as
the C name of the DEFUN rather than a symbol visible as a
Lisp_Object, on debug builds assert that we're actually in the
function so we choke on badly-done copy-and-pasting,
* lisp.h (PARSE_KEYWORDS_8): New. This is the old PARSE_KEYWORDS.
* fns.c (Fmerge, FsortX, Ffill, Freduce, Freplace):
Change to use the new PARSE_KEYWORDS syntax.
* elhash.c (Fmake_hash_table): Chance to the new PARSE_KEYWORDS
syntax, rename a define to correspond to what other files use.
* symbols.c (intern_massaging_name):
* buffer.c (ADD_INT):
Rename intern_converting_underscores_to_dashes() to
intern_massaging_name(), now it does a little more.
author | Aidan Kehoe <kehoea@parhasard.net> |
---|---|
date | Sat, 18 Sep 2010 15:57:20 +0100 |
parents | 6ef8256a020a |
children | 308d34e9f07d |
line wrap: on
line source
/* Definitions of marked slots in keymaps. Copyright (C) 1985, 1991-1995 Free Software Foundation, Inc. Copyright (C) 1995 Board of Trustees, University of Illinois. Copyright (C) 1995 Sun Microsystems, Inc. Copyright (C) 2001, 2002, 2010 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 2, 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; see the file COPYING. If not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /* Synched up with: Not in FSF. Split out of keymap.c. */ /* We define the Lisp_Objects in the keymap 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. MARKED_SLOT_NOCOMPARE is used to indicate a slot that should not be compared in the equal() method or hashed in the hash() method -- basically, a slot used for caching, debugging, etc. instead of for defining a property of the keymap. */ #ifndef MARKED_SLOT_NOCOMPARE #define MARKED_SLOT_NOCOMPARE MARKED_SLOT #endif MARKED_SLOT (parents) /* Keymaps to be searched after this one. An ordered list */ MARKED_SLOT (prompt) /* Qnil or a string to print in the minibuffer when reading from this keymap */ MARKED_SLOT (table) /* The contents of this keymap */ MARKED_SLOT_NOCOMPARE (inverse_table) /* The inverse mapping of the above */ MARKED_SLOT (default_binding) /* Use this if no other binding is found (this overrides parent maps and the normal global-map lookup). */ MARKED_SLOT_NOCOMPARE (sub_maps_cache) /* Cache of directly inferior keymaps; This holds an alist, of the key and the maps, or the modifier bit and the map. If this is the symbol t, then the cache needs to be recomputed. */ MARKED_SLOT_NOCOMPARE (name) /* Just for debugging convenience */ #undef MARKED_SLOT #undef MARKED_SLOT_NOCOMPARE