Mercurial > hg > xemacs-beta
view nt/xpm.mak @ 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
# # XPM Makefile for Microsoft NMAKE without X libraries # # Copyright (C) 1997 Free Software Foundation, Inc. # # 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/>. # !if !defined(DEBUG) !if defined(DEBUG_XEMACS) DEBUG=$(DEBUG_XEMACS) !else DEBUG=0 !endif !endif !if !defined(USE_CRTDLL) USE_CRTDLL=1 !endif !if $(DEBUG) OPT=-Od -Zi LINK_DEBUG=-debug !else OPT=-Ox !endif !if $(USE_CRTDLL) !if $(DEBUG) C_LIBFLAG=-MDd !else C_LIBFLAG=-MD !endif !else !if $(DEBUG) C_LIBFLAG=-MLd !else C_LIBFLAG=-ML !endif !endif WARN_CPP_FLAGS = -W3 CC=cl CFLAGS=-nologo -DFOR_MSW $(C_LIBFLAG) $(WARN_CPP_FLAGS) \ $(OPT) $(INCLUDES) -c OBJS= data.obj create.obj misc.obj rgb.obj scan.obj parse.obj hashtab.obj \ WrFFrI.obj RdFToI.obj CrIFrDat.obj CrDatFrI.obj \ CrIFrBuf.obj CrBufFrI.obj \ RdFToDat.obj WrFFrDat.obj \ Attrib.obj Image.obj Info.obj RdFToBuf.obj WrFFrBuf.obj \ simx.obj # nmake rule .SUFFIXES: .SUFFIXES: .c .c.obj:: $(CC) $(CFLAGS) $< # targets all: ..\X11\xpm.h Xpm.lib ..\X11\xpm.h: ..\X11\NUL xpm.h copy xpm.h ..\X11 ..\X11\NUL: mkdir ..\X11 Xpm.lib: $(OBJS) lib -nologo -out:$@ $(OBJS)