[Emacs-diffs] Changes to emacs/lisp/emulation/viper-keym.el

[Michael Kifer]

Index: emacs/lisp/emulation/viper-keym.el
diff -c emacs/lisp/emulation/viper-keym.el:1.26 
emacs/lisp/emulation/viper-keym.el:1.27
*** emacs/lisp/emulation/viper-keym.el:1.26     Sun Sep  9 18:33:38 2001
--- emacs/lisp/emulation/viper-keym.el  Mon Jan  7 23:36:00 2002
***************
*** 1,8 ****
  ;;; viper-keym.el --- Viper keymaps
  
! ;; Copyright (C) 1994, 1995, 1996, 1997 Free Software Foundation, Inc.
  
! ;; Author: Michael Kifer <address@hidden>
  
  ;; This file is part of GNU Emacs.
  
--- 1,8 ----
  ;;; viper-keym.el --- Viper keymaps
  
! ;; Copyright (C) 1994, 95, 96, 97, 2000, 01, 02 Free Software Foundation, Inc.
  
! ;; Author: Michael Kifer <address@hidden>
  
  ;; This file is part of GNU Emacs.
  
***************
*** 616,626 ****
             
  (defun viper-add-keymap (mapsrc mapdst) 
    "Add contents of mapsrc to mapdst.  It is assumed that mapsrc is sparse."
!   (if viper-xemacs-p
!       (map-keymap (lambda (key binding) (define-key mapdst key binding))
!                 mapsrc)
!     (mapcar (lambda (p) (define-key mapdst (vector (car p)) (cdr p)))
!           (cdr mapsrc))))
    
  (defun viper-modify-keymap (map alist)
     "Modifies MAP with bindings specified in the ALIST.  The alist has the
--- 616,629 ----
             
  (defun viper-add-keymap (mapsrc mapdst) 
    "Add contents of mapsrc to mapdst.  It is assumed that mapsrc is sparse."
!   (viper-cond-compile-for-xemacs-or-emacs
!    ;; xemacs
!    (map-keymap (lambda (key binding) (define-key mapdst key binding))
!              mapsrc)
!    ;; emacs
!    (mapcar (lambda (p) (define-key mapdst (vector (car p)) (cdr p)))
!          (cdr mapsrc))
!    ))
    
  (defun viper-modify-keymap (map alist)
     "Modifies MAP with bindings specified in the ALIST.  The alist has the