HCoop
/
bpt
/
emacs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
[bpt/emacs.git]
/
lisp
/
emulation
/
viper-keym.el
diff --git
a/lisp/emulation/viper-keym.el
b/lisp/emulation/viper-keym.el
index
cad5f34
..
0b978d9
100644
(file)
--- a/
lisp/emulation/viper-keym.el
+++ b/
lisp/emulation/viper-keym.el
@@
-1,8
+1,8
@@
;;; viper-keym.el --- Viper keymaps
;;; viper-keym.el --- Viper keymaps
-;; Copyright (C) 1994,
1995, 1996, 1997
Free Software Foundation, Inc.
+;; Copyright (C) 1994,
95, 96, 97, 2000, 01, 02
Free Software Foundation, Inc.
-;; Author: Michael Kifer <kifer@cs.s
unysb
.edu>
+;; Author: Michael Kifer <kifer@cs.s
tonybrook
.edu>
;; This file is part of GNU Emacs.
;; This file is part of GNU Emacs.
@@
-616,11
+616,14
@@
Arguments: (major-mode viper-state keymap)"
(defun viper-add-keymap (mapsrc mapdst)
"Add contents of mapsrc to mapdst. It is assumed that mapsrc is sparse."
(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))))
+ (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
(defun viper-modify-keymap (map alist)
"Modifies MAP with bindings specified in the ALIST. The alist has the