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

[Glenn Morris]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Glenn Morris <gm>       08/03/01 20:11:01

Index: viper-keym.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/emulation/viper-keym.el,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -b -r1.49 -r1.50
--- viper-keym.el       10 Jan 2008 06:54:11 -0000      1.49
+++ viper-keym.el       1 Mar 2008 20:11:00 -0000       1.50
@@ -681,14 +681,12 @@
 
 (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
+  (if (featurep 'xemacs)
+      ;; Emacs 22 has map-keymap.
    (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))
-   ))
+    (mapc (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