Mercurial > hg > xemacs-beta
annotate nt/xpm.mak @ 5182:2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
lisp/ChangeLog addition:
2010-04-01 Aidan Kehoe <kehoea@parhasard.net>
* cl-seq.el (fill, sort*, merge): Move these functions to fns.c.
(stable-sort): Make this docstring reflect the argument names used
in the #'sort* docstring.
* cl-macs.el (stable-sort): Make #'stable-sort exactly equivalent
to #'sort* in compiled code.
* bytecomp.el (byte-compile-maybe-add-*):
New macro, for functions like #'sort and #'mapcar that, to be
strictly compatible, should only take two args, but in our
implementation can take more, because they're aliases of #'sort*
and #'mapcar*.
(byte-compile-mapcar, byte-compile-sort, byte-compile-fillarray):
Use this new macro.
(map-into): Add a byte-compile method for #'map-into in passing.
* apropos.el (apropos-print): Use #'sort* with a :key argument,
now it's in C.
* compat.el (extent-at): Ditto.
* register.el (list-registers): Ditto.
* package-ui.el (pui-list-packages): Ditto.
* help.el (sorted-key-descriptions): Ditto.
src/ChangeLog addition:
2010-03-31 Aidan Kehoe <kehoea@parhasard.net>
* fns.c (STRING_DATA_TO_OBJECT_ARRAY)
(BIT_VECTOR_TO_OBJECT_ARRAY, c_merge_predicate_key)
(c_merge_predicate_nokey, list_merge, array_merge)
(list_array_merge_into_list, list_list_merge_into_array)
(list_array_merge_into_array, CHECK_KEY_ARGUMENT, Fmerge)
(list_sort, array_sort, FsortX):
Move #'sort*, #'fill, #'merge from cl-seq.el to C, extending the
implementations of Fsort, Ffillarray, and merge() to do so.
* keymap.c (keymap_submaps, map_keymap_sort_predicate)
(describe_map_sort_predicate):
Change the calling semantics of the C sort predicates to return a
non-nil Lisp object if the first argument is less than the second,
rather than C integers.
* fontcolor-msw.c (sort_font_list_function):
* fileio.c (build_annotations):
* dired.c (Fdirectory_files):
* abbrev.c (Finsert_abbrev_table_description):
Call list_sort instead of Fsort, list_merge instead of merge() in
these functions.
man/ChangeLog addition:
2010-04-01 Aidan Kehoe <kehoea@parhasard.net>
* lispref/lists.texi (Rearrangement):
Update the documentation of #'sort here, now that it accepts any
type of sequence and the KEY keyword argument. (Though this is
probably now the wrong place for this function, given that.)
author | Aidan Kehoe <kehoea@parhasard.net> |
---|---|
date | Thu, 01 Apr 2010 20:22:50 +0100 |
parents | 5274591ce707 |
children | ba07c880114a |
rev | line source |
---|---|
276 | 1 # |
2 # XPM Makefile for Microsoft NMAKE without X libraries | |
3 # | |
4927
5274591ce707
Add copyright and license information for Jonathan Harris's contributions.
Jerry James <james@xemacs.org>
parents:
817
diff
changeset
|
4 # Copyright (C) 1997 Free Software Foundation, Inc. |
5274591ce707
Add copyright and license information for Jonathan Harris's contributions.
Jerry James <james@xemacs.org>
parents:
817
diff
changeset
|
5 # |
5274591ce707
Add copyright and license information for Jonathan Harris's contributions.
Jerry James <james@xemacs.org>
parents:
817
diff
changeset
|
6 # This file is part of XEmacs. |
5274591ce707
Add copyright and license information for Jonathan Harris's contributions.
Jerry James <james@xemacs.org>
parents:
817
diff
changeset
|
7 # |
5274591ce707
Add copyright and license information for Jonathan Harris's contributions.
Jerry James <james@xemacs.org>
parents:
817
diff
changeset
|
8 # XEmacs is free software; you can redistribute it and/or modify it |
5274591ce707
Add copyright and license information for Jonathan Harris's contributions.
Jerry James <james@xemacs.org>
parents:
817
diff
changeset
|
9 # under the terms of the GNU General Public License as published by the |
5274591ce707
Add copyright and license information for Jonathan Harris's contributions.
Jerry James <james@xemacs.org>
parents:
817
diff
changeset
|
10 # Free Software Foundation; either version 2, or (at your option) any |
5274591ce707
Add copyright and license information for Jonathan Harris's contributions.
Jerry James <james@xemacs.org>
parents:
817
diff
changeset
|
11 # later version. |
5274591ce707
Add copyright and license information for Jonathan Harris's contributions.
Jerry James <james@xemacs.org>
parents:
817
diff
changeset
|
12 # |
5274591ce707
Add copyright and license information for Jonathan Harris's contributions.
Jerry James <james@xemacs.org>
parents:
817
diff
changeset
|
13 # XEmacs is distributed in the hope that it will be useful, but WITHOUT |
5274591ce707
Add copyright and license information for Jonathan Harris's contributions.
Jerry James <james@xemacs.org>
parents:
817
diff
changeset
|
14 # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
5274591ce707
Add copyright and license information for Jonathan Harris's contributions.
Jerry James <james@xemacs.org>
parents:
817
diff
changeset
|
15 # FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
5274591ce707
Add copyright and license information for Jonathan Harris's contributions.
Jerry James <james@xemacs.org>
parents:
817
diff
changeset
|
16 # for more details. |
5274591ce707
Add copyright and license information for Jonathan Harris's contributions.
Jerry James <james@xemacs.org>
parents:
817
diff
changeset
|
17 # |
5274591ce707
Add copyright and license information for Jonathan Harris's contributions.
Jerry James <james@xemacs.org>
parents:
817
diff
changeset
|
18 # You should have received a copy of the GNU General Public License |
5274591ce707
Add copyright and license information for Jonathan Harris's contributions.
Jerry James <james@xemacs.org>
parents:
817
diff
changeset
|
19 # along with XEmacs; see the file COPYING. If not, write to |
5274591ce707
Add copyright and license information for Jonathan Harris's contributions.
Jerry James <james@xemacs.org>
parents:
817
diff
changeset
|
20 # the Free Software Foundation, Inc., 51 Franklin St. - Fifth Floor, |
5274591ce707
Add copyright and license information for Jonathan Harris's contributions.
Jerry James <james@xemacs.org>
parents:
817
diff
changeset
|
21 # Boston, MA 02110-1301, USA. |
5274591ce707
Add copyright and license information for Jonathan Harris's contributions.
Jerry James <james@xemacs.org>
parents:
817
diff
changeset
|
22 # |
398 | 23 !if !defined(DEBUG) |
24 !if defined(DEBUG_XEMACS) | |
25 DEBUG=$(DEBUG_XEMACS) | |
26 !else | |
27 DEBUG=0 | |
28 !endif | |
29 !endif | |
276 | 30 |
398 | 31 !if !defined(USE_CRTDLL) |
817 | 32 USE_CRTDLL=1 |
276 | 33 !endif |
34 | |
398 | 35 !if $(DEBUG) |
276 | 36 OPT=-Od -Zi |
398 | 37 LINK_DEBUG=-debug |
276 | 38 !else |
398 | 39 OPT=-Ox |
40 !endif | |
41 | |
42 !if $(USE_CRTDLL) | |
43 !if $(DEBUG) | |
44 C_LIBFLAG=-MDd | |
45 !else | |
46 C_LIBFLAG=-MD | |
47 !endif | |
48 !else | |
49 !if $(DEBUG) | |
50 C_LIBFLAG=-MLd | |
51 !else | |
52 C_LIBFLAG=-ML | |
53 !endif | |
276 | 54 !endif |
55 | |
56 WARN_CPP_FLAGS = -W3 | |
57 | |
58 CC=cl | |
398 | 59 CFLAGS=-nologo -DFOR_MSW $(C_LIBFLAG) $(WARN_CPP_FLAGS) \ |
60 $(OPT) $(INCLUDES) -c | |
276 | 61 |
62 OBJS= data.obj create.obj misc.obj rgb.obj scan.obj parse.obj hashtab.obj \ | |
63 WrFFrI.obj RdFToI.obj CrIFrDat.obj CrDatFrI.obj \ | |
64 CrIFrBuf.obj CrBufFrI.obj \ | |
65 RdFToDat.obj WrFFrDat.obj \ | |
66 Attrib.obj Image.obj Info.obj RdFToBuf.obj WrFFrBuf.obj \ | |
67 simx.obj | |
68 | |
69 # nmake rule | |
70 | |
71 .SUFFIXES: | |
72 .SUFFIXES: .c | |
73 | |
398 | 74 .c.obj:: |
75 $(CC) $(CFLAGS) $< | |
276 | 76 |
77 | |
78 # targets | |
79 | |
80 all: ..\X11\xpm.h Xpm.lib | |
81 | |
82 ..\X11\xpm.h: ..\X11\NUL xpm.h | |
83 copy xpm.h ..\X11 | |
84 | |
85 ..\X11\NUL: | |
86 mkdir ..\X11 | |
87 | |
88 Xpm.lib: $(OBJS) | |
398 | 89 lib -nologo -out:$@ $(OBJS) |