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.

: #-*- Perl -*-

# Generate dependency info in a form acceptable to nmake
#
# Copyright (C) 2000, 2002 Jonathan Harris.
#
# 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/>.
#
# Author: Jonathan Harris <jonathan@xemacs.org>
#
# Synched up with: Not in FSF.

use Getopt::Long;

my $optsok = GetOptions ('src=s' => \$src,
			 'config=s' => \$config,
			 'obj=s' => \$obj);

die "Generates nmake dependencies for the XEmacs src directory.

Usage: $0 --src SRCDIR --config CONFIGDIR --obj OBJDIR

  SRCDIR        Location of XEmacs sources
  CONFIGDIR     Location of config.inc
  OBJDIR	Location for compiler-generated object files

Expects output from src/make-src-depend on stdin.
The dependencies are written to stdout.
" if (@ARGV || !$optsok
      || !defined ($src) || !defined ($config) || !defined ($obj));

while (<>)
  {
    # must hack away CRLF junk.  wouldn't it be nice if perl handled this
    # right??  really can't be that hard!!!
    s/\r\n/\n/g;

    # rewrite references to generating script
    s/make-src-depend/make-nt-depend/;

    # rewrite '#if defined(...)' into nmake syntax
    s/^#if defined(.+)/!if defined$1/;

    # rewrite '#else' and '#endif' into nmake syntax
    s/^#e/!e/;

    # add src path to source filenames
    # allow for source filename being used in variable assignment
    s/([\s=])([\w\d\.\-]+\.[ch])/$1$src\\$2/g;

    # add obj path to object filenames
    # rewrite .o to .obj
    s/^(.+)\.o:(.+)/$obj\\$1.obj:$2/;

    # add dependency on config.inc wherever config.h is.
    s/\\config.h/\\config.h $config\\config.inc/;
   print;
  }