Mercurial > hg > xemacs-beta
view src/frameslots.h @ 5634:2014ff433daf
Support hash COLLECTIONs, #'{all,try}-completion{s,}; add #'test-completion
src/ChangeLog addition:
2012-01-01 Aidan Kehoe <kehoea@parhasard.net>
Add #'test-completion, API from GNU.
Accept hash table COLLECTIONs in it and in the other
completion-oriented functions, #'try-completion,
#'all-completions, and those Lisp functions implemented in terms
of them.
* lisp.h: Update the prototype of map_obarray(), making FN
compatible with the FUNCTION argument of elisp_maphash();
* abbrev.c (abbrev_match_mapper):
* abbrev.c (record_symbol):
* doc.c (verify_doc_mapper):
* symbols.c (mapatoms_1):
* symbols.c (apropos_mapper):
Update these mapper functions to reflect the new argument to
map_obarray().
* symbols.c (map_obarray):
Call FN with two arguments, the string name of the symbol, and the
symbol itself, for API (mapper) compatibility with
elisp_maphash().
* minibuf.c (map_completion): New. Map a maphash_function_t across
a non function COLLECTION, as appropriate for #'try-completion and
friends.
* minibuf.c (map_completion_list): New. Map a maphash_function_t
across a pseudo-alist, as appropriate for the completion
functions.
* minibuf.c (ignore_completion_p): PRED needs to be called with
two args if and only if the collection is a hash table. Implement
this.
* minibuf.c (try_completion_mapper): New. The loop body of
#'try-completion, refactored out.
* minibuf.c (Ftry_completion): Use try_completion_mapper(),
map_completion().
* minibuf.c (all_completions_mapper): New. The loop body of
#'all-completions, refactored out.
* minibuf.c (Fall_completions): Use all_completions_mapper(),
map_completion().
* minibuf.c (test_completion_mapper): New. The loop body of
#'test-completion.
* minibuf.c (Ftest_completion): New, API from GNU.
* minibuf.c (syms_of_minibuf): Make Ftest_completion available.
tests/ChangeLog addition:
2012-01-01 Aidan Kehoe <kehoea@parhasard.net>
* automated/completion-tests.el: New.
Test #'try-completion, #'all-completion and #'test-completion with
list, vector and hash-table COLLECTION arguments.
author | Aidan Kehoe <kehoea@parhasard.net> |
---|---|
date | Sun, 01 Jan 2012 15:18:52 +0000 |
parents | 308d34e9f07d |
children |
line wrap: on
line source
/* Definitions of marked slots in frames Copyright (C) 1988, 1992, 1993, 1994 Free Software Foundation, Inc. Copyright (C) 1996, 2002, 2003 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: FSF 19.30. Split out of frame.h. */ /* We define the Lisp_Objects in the frame 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. In the structure definition, you also need to define FRAME_SLOT_DECLARATION. No need to undefine either value; that happens automatically. */ #ifndef MARKED_SLOT_ARRAY #ifdef FRAME_SLOT_DECLARATION #define MARKED_SLOT_ARRAY(slot, size) MARKED_SLOT(slot[size]) #else #define MARKED_SLOT_ARRAY(slot, size) do { \ int mslotidx; \ for (mslotidx = 0; mslotidx < size; mslotidx++) \ { \ MARKED_SLOT (slot[mslotidx]) \ } \ } while (0); #endif #endif /* not MARKED_SLOT_ARRAY */ /* device frame belongs to. */ MARKED_SLOT (device) /* Name of this frame: a Lisp string. NOT the same as the frame's title, even though FSF bogusly confuses the two. The frame's name is used for resourcing and lookup purposes and is something you can count on having a specific value, while the frame's title may vary depending on the user's choice of `frame-title-format'. */ MARKED_SLOT (name) /* The frame which should receive keystrokes that occur in this frame, or nil if they should go to the frame itself. This is usually nil, but if the frame is minibufferless, we can use this to redirect keystrokes to a surrogate minibuffer frame when needed. Note that a value of nil is different than having the field point to the frame itself. Whenever the Fselect_frame function is used to shift from one frame to the other, any redirections to the original frame are shifted to the newly selected frame; if focus_frame is nil, Fselect_frame will leave it alone. */ MARKED_SLOT (focus_frame) /* This frame's root window. Every frame has one. If the frame has only a minibuffer window, this is it. Otherwise, if the frame has a minibuffer window, this is its sibling. */ MARKED_SLOT (root_window) /* This frame's selected window. Each frame has its own window hierarchy and one of the windows in it is selected within the frame. The selected window of the selected frame is Emacs's selected window. */ MARKED_SLOT (selected_window) /* This frame's minibuffer window. Most frames have their own minibuffer windows, but only the selected frame's minibuffer window can actually appear to exist. */ MARKED_SLOT (minibuffer_window) /* The most recently selected nonminibuf window. This is used by things like the toolbar code, which doesn't want the toolbar to change when moving to the minibuffer. This will only be a minibuf window if we are a minibuf-only frame. */ MARKED_SLOT (last_nonminibuf_window) /* This frame's root window mirror. This structure exactly mirrors the frame's window structure but contains only pointers to the display structures. */ MARKED_SLOT (root_mirror) /* frame property list */ MARKED_SLOT (plist) /* buffer_alist at last redisplay. */ MARKED_SLOT (old_buffer_alist) /* A copy of the global Vbuffer_list, to maintain a per-frame buffer ordering. The Vbuffer_list variable and the buffer_list slot of each frame contain exactly the same data, just in different orders. */ MARKED_SLOT (buffer_alist) /* Predicate for selecting buffers for other-buffer. */ MARKED_SLOT (buffer_predicate) /* The current mouse pointer for the frame. This is set by calling `set-frame-pointer'. */ MARKED_SLOT (pointer) /* The current icon for the frame. */ MARKED_SLOT (icon) /* specifier values cached in the struct frame: */ #ifdef HAVE_MENUBARS MARKED_SLOT (menubar_visible_p) #endif #ifdef HAVE_SCROLLBARS /* Width and height of the scrollbars. */ MARKED_SLOT (scrollbar_width) MARKED_SLOT (scrollbar_height) /* Whether the scrollbars are visible */ MARKED_SLOT (horizontal_scrollbar_visible_p) MARKED_SLOT (vertical_scrollbar_visible_p) /* Scrollbars location */ MARKED_SLOT (scrollbar_on_left_p) MARKED_SLOT (scrollbar_on_top_p) #endif #ifdef HAVE_TOOLBARS /* The following three don't really need to be cached except that we need to know when they've changed. */ MARKED_SLOT (default_toolbar_width) MARKED_SLOT (default_toolbar_height) MARKED_SLOT (default_toolbar_visible_p) MARKED_SLOT (default_toolbar_border_width) MARKED_SLOT (toolbar_shadow_thickness) /* List of toolbar buttons of current toolbars */ MARKED_SLOT_ARRAY (toolbar_buttons, 4) /* Size of the toolbars. The frame-local toolbar space is subtracted before the windows are arranged. Window and buffer local toolbars overlay their windows. */ MARKED_SLOT_ARRAY (toolbar_size, 4) /* Visibility of the toolbars. This acts as a valve for toolbar_size. */ MARKED_SLOT_ARRAY (toolbar_visible_p, 4) /* Thickness of the border around the toolbar. */ MARKED_SLOT_ARRAY (toolbar_border_width, 4) #endif /* Cache of subwindow instances for this frame */ MARKED_SLOT (subwindow_instance_cache) /* Possible frame-local default for outside margin widths. */ MARKED_SLOT (left_margin_width) MARKED_SLOT (right_margin_width) #undef MARKED_SLOT #undef MARKED_SLOT_ARRAY #undef FRAME_SLOT_DECLARATION