Mercurial > hg > xemacs-beta
view nt/tiff.mak @ 5679:a81a739181dc
Add command remapping, a more robust alternative to #'substitute-key-definition
src/ChangeLog addition:
2012-09-02 Aidan Kehoe <kehoea@parhasard.net>
* keymap.c:
Add command remapping, a more robust equivalent to
#'substitute-key-definition.
* keymap.c (CHECK_REMAPPING_POSITION): New.
* keymap.c (keymap_equal): Correct a comment here.
* keymap.c (Fdefine_key): Document the command remapping syntax.
* keymap.c (Fremap_command): New.
* keymap.c (command_remapping): New.
* keymap.c (Fcommand_remapping): New.
* keymap.c (commands_remapped_to_mapper): New.
* keymap.c (commands_remapped_to_traverser): New.
* keymap.c (Fcommands_remapped_to): New.
* keymap.c (get_relevant_keymaps): Take a new POSITION argument.
* keymap.c (Fcurrent_keymaps, event_binding):
Supply the new POSITION argument to get_relevant_keymaps.
* keymap.c (Fkey_binding):
Add new arguments, NO-REMAP and POSITION.
* keymap.c (map_keymap_mapper):
* keymap.c (Fwhere_is_internal):
* keymap.c (where_is_to_char):
* keymap.c (where_is_recursive_mapper):
Don't expose the key remapping in these functions. This conflicts
with GNU, but is more sane for our callers. Access to command
remapping is with the functions #'command-remapping,
#'commands-remapped-to, and #'remap-command, not with the general
keymap functions, apart from the compatibility hack in #'define-key.
* keymap.c (syms_of_keymap):
* keymap.c (vars_of_keymap):
* keymap.c (complex_vars_of_keymap):
* lisp.h: New CHECK_COMMAND macro.
man/ChangeLog addition:
2012-09-02 Aidan Kehoe <kehoea@parhasard.net>
* lispref/keymaps.texi (Keymaps):
* lispref/keymaps.texi (Changing Key Bindings):
* lispref/keymaps.texi (Scanning Keymaps):
* lispref/keymaps.texi (Remapping commands):
* lispref/keymaps.texi (XEmacs): New.
* lispref/keymaps.texi (Other Keymap Functions):
Document the new command remapping functionality in this file.
lisp/ChangeLog addition:
2012-09-02 Aidan Kehoe <kehoea@parhasard.net>
* help.el (describe-function-1):
Document any command remapping that has been done in this function.
tests/ChangeLog addition:
2012-09-02 Aidan Kehoe <kehoea@parhasard.net>
* automated/keymap-tests.el:
Test the new command remapping functionality.
author | Aidan Kehoe <kehoea@parhasard.net> |
---|---|
date | Sun, 02 Sep 2012 14:31:40 +0100 |
parents | 365bc8cb5894 |
children |
line wrap: on
line source
## TIFF makefile for Microsoft nmake ## Copyright (C) 2001 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/>. !if !defined(DEBUG_XEMACS) DEBUG_XEMACS=0 !endif !if $(DEBUG_XEMACS) OPT=-Od -Zi !else OPT=-O2 -G5 !endif WARN_CPP_FLAGS = -W3 CFLAGS=-nologo -DFOR_MSW $(WARN_CPP_FLAGS) $(OPT) -c OUTDIR=.\WinRel OBJDIR=.\WinRel # the following is because fax3sm.c references "tiff.h" and "tif_fax3.h", # under the assumption that those header files are in the same directory # as fax3sm.c But, since we're using a special fax3sm.c file, and we # can't be sure the user has patch to change "xx" to "..\..\libtiff\xx", # let's just copy these header files to this directory. (Symbolic links # would be _so_ nice) NEED_FOR_COMPILE= tiff.h tif_fax3.h CPP=cl.exe CPP_PROJ= /GX /YX /I "." /I ".." /D "WIN32" /D "NDEBUG" /D\ "_WINDOWS" /FR$(OBJDIR)/ /Fp$(OUTDIR)/"libtiff.pch" $(CFLAGS) BSC32=bscmake.exe BSC32_FLAGS=/nologo /o$(OUTDIR)/libtiff.bsc LIB32=lib.exe LIB32_FLAGS=/NOLOGO /OUT:$(OUTDIR)\libtiff.lib DEF_FLAGS= DEF_FILE= BSC32_SBRS= \ $(OBJDIR)\tif_jpeg.sbr \ $(OBJDIR)\tif_dirinfo.sbr \ $(OBJDIR)\tif_win32.sbr \ $(OBJDIR)\tif_flush.sbr \ $(OBJDIR)\tif_thunder.sbr \ $(OBJDIR)\tif_compress.sbr \ $(OBJDIR)\tif_print.sbr \ $(OBJDIR)\tif_dirread.sbr \ $(OBJDIR)\tif_getimage.sbr \ $(OBJDIR)\tif_fax3.sbr \ $(OBJDIR)\tif_version.sbr \ $(OBJDIR)\tif_codec.sbr \ $(OBJDIR)\tif_dir.sbr \ $(OBJDIR)\tif_predict.sbr \ $(OBJDIR)\tif_close.sbr \ $(OBJDIR)\tif_dumpmode.sbr \ $(OBJDIR)\tif_aux.sbr \ $(OBJDIR)\tif_error.sbr \ $(OBJDIR)\tif_lzw.sbr \ $(OBJDIR)\tif_zip.sbr \ $(OBJDIR)\tif_read.sbr \ $(OBJDIR)\tif_packbits.sbr \ $(OBJDIR)\tif_swab.sbr \ $(OBJDIR)\tif_dirwrite.sbr \ $(OBJDIR)\tif_open.sbr \ $(OBJDIR)\tif_warning.sbr \ $(OBJDIR)\tif_tile.sbr \ $(OBJDIR)\tif_strip.sbr \ $(OBJDIR)\tif_next.sbr \ $(OBJDIR)\tif_write.sbr \ $(OBJDIR)\fax3sm.sbr LIB32_OBJS= \ $(OBJDIR)\tif_jpeg.obj \ $(OBJDIR)\tif_dirinfo.obj \ $(OBJDIR)\tif_win32.obj \ $(OBJDIR)\tif_flush.obj \ $(OBJDIR)\tif_thunder.obj \ $(OBJDIR)\tif_compress.obj \ $(OBJDIR)\tif_print.obj \ $(OBJDIR)\tif_dirread.obj \ $(OBJDIR)\tif_getimage.obj \ $(OBJDIR)\tif_fax3.obj \ $(OBJDIR)\tif_version.obj \ $(OBJDIR)\tif_codec.obj \ $(OBJDIR)\tif_dir.obj \ $(OBJDIR)\tif_predict.obj \ $(OBJDIR)\tif_close.obj \ $(OBJDIR)\tif_dumpmode.obj \ $(OBJDIR)\tif_aux.obj \ $(OBJDIR)\tif_error.obj \ $(OBJDIR)\tif_lzw.obj \ $(OBJDIR)\tif_zip.obj \ $(OBJDIR)\tif_read.obj \ $(OBJDIR)\tif_packbits.obj \ $(OBJDIR)\tif_swab.obj \ $(OBJDIR)\tif_dirwrite.obj \ $(OBJDIR)\tif_open.obj \ $(OBJDIR)\tif_warning.obj \ $(OBJDIR)\tif_tile.obj \ $(OBJDIR)\tif_strip.obj \ $(OBJDIR)\tif_next.obj \ $(OBJDIR)\tif_write.obj \ $(OBJDIR)\fax3sm.obj # nmake rule .SUFFIXES: .SUFFIXES: .c .obj {..\..\libtiff}.c{$(OBJDIR)}.obj: $(CPP) $(CPP_PROJ) $< -Fo$@ ALL : $(OUTDIR)/libtiff.lib $(OUTDIR)/libtiff.bsc clean : -del tiff.h -del tif_fax3.h -del t4.h -del tiffcomp.h -del tiffconf.h -del tiffio.h -del ..\..\libtiff\libtiff.lib -del *.pdb -del $(OBJDIR)\*.obj -del $(OBJDIR)\*.sbr -del $(OUTDIR)\libtiff.lib -del $(OUTDIR)\libtiff.bsc -del $(OUTDIR)\libtiff.pch -rmdir $(OUTDIR) tiff.h : if not exist ./tiff.h copy ..\..\libtiff\tiff.h . tif_fax3.h : if not exist ./tif_fax3.h copy ..\..\libtiff\tif_fax3.h . $(OUTDIR) : $(NEED_FOR_COMPILE) if not exist $(OUTDIR)/nul mkdir $(OUTDIR) $(OUTDIR)/libtiff.bsc : $(OUTDIR) $(BSC32_SBRS) $(BSC32) @<< $(BSC32_FLAGS) $(BSC32_SBRS) << $(OUTDIR)/libtiff.lib : $(OUTDIR) $(DEF_FILE) $(LIB32_OBJS) $(LIB32) @<< $(LIB32_FLAGS) $(DEF_FLAGS) $(LIB32_OBJS) << copy $(OUTDIR)\libtiff.lib ..\..\libtiff\libtiff.lib DEP_FAX3S=\ ..\..\libtiff\tiff.h \ ..\..\libtiff\tif_fax3.h $(OBJDIR)/fax3sm.obj : $(DEP_FAX3S) $(OBJDIR) $(CPP) $(CPP_PROJ) .\fax3sm.c -Fo$@