Mercurial > hg > xemacs-beta

comparison src/keymap.c @ 3017:1e7cc382eb16

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[xemacs-hg @ 2005-10-24 10:07:26 by ben] refactor mc-alloc dependencies next-error.el, occur.el: Fix some byte-compile warnings. alloc.c, buffer.c, buffer.h, casetab.c, casetab.h, charset.h, chartab.c, chartab.h, console-impl.h, console-msw-impl.h, console.c, data.c, database.c, device-impl.h, device-msw.c, device.c, dialog-msw.c, elhash.c, events.h, extents-impl.h, extents.c, faces.c, faces.h, file-coding.c, file-coding.h, frame-impl.h, frame.c, glyphs.c, glyphs.h, gui.c, gui.h, keymap.c, lisp.h, lrecord.h, lstream.c, lstream.h, mule-charset.c, objects-impl.h, objects.c, opaque.c, opaque.h, print.c, process.c, procimpl.h, rangetab.c, rangetab.h, scrollbar-gtk.c, scrollbar-msw.c, scrollbar-x.c, scrollbar.c, scrollbar.h, specifier.c, specifier.h, symbols.c, symeval.h, toolbar.c, toolbar.h, tooltalk.c, ui-gtk.c, ui-gtk.h, unicode.c, window-impl.h, window.c: Eliminate the majority of #ifdef MC_ALLOC occurrences through macros LCRECORD_HEADER, ALLOC_LCRECORD_TYPE, MALLOCED_STORAGE_SIZE, etc. (defined in lrecord.h).
author ben
date Mon, 24 Oct 2005 10:07:42 +0000
parents b95fe16005fd
children facf3239ba30
comparison
equal deleted inserted replaced
3016:f252275fb013 3017:1e7cc382eb16
146 146
147 */ 147 */
148 148
149 struct Lisp_Keymap 149 struct Lisp_Keymap
150 { 150 {
151 #ifdef MC_ALLOC 151 struct LCRECORD_HEADER header;
152 struct lrecord_header header;
153 #else /* MC_ALLOC */
154 struct lcrecord_header header;
155 #endif /* MC_ALLOC */
156 Lisp_Object parents; /* Keymaps to be searched after this one. 152 Lisp_Object parents; /* Keymaps to be searched after this one.
157 An ordered list */ 153 An ordered list */
158 Lisp_Object prompt; /* Qnil or a string to print in the minibuffer 154 Lisp_Object prompt; /* Qnil or a string to print in the minibuffer
159 when reading from this keymap */ 155 when reading from this keymap */
160 Lisp_Object table; /* The contents of this keymap */ 156 Lisp_Object table; /* The contents of this keymap */
758 754
759 static Lisp_Object 755 static Lisp_Object
760 make_keymap (Elemcount size) 756 make_keymap (Elemcount size)
761 { 757 {
762 Lisp_Object result; 758 Lisp_Object result;
763 #ifdef MC_ALLOC 759 Lisp_Keymap *keymap = ALLOC_LCRECORD_TYPE (Lisp_Keymap, &lrecord_keymap);
764 Lisp_Keymap *keymap = alloc_lrecord_type (Lisp_Keymap, &lrecord_keymap);
765 #else /* not MC_ALLOC */
766 Lisp_Keymap *keymap = alloc_lcrecord_type (Lisp_Keymap, &lrecord_keymap);
767 #endif /* not MC_ALLOC */
768 760
769 result = wrap_keymap (keymap); 761 result = wrap_keymap (keymap);
770 762
771 keymap->parents = Qnil; 763 keymap->parents = Qnil;
772 keymap->prompt = Qnil; 764 keymap->prompt = Qnil;