Merge from emacs--rel--22

[gnu-emacs] / lisp / emulation / viper-keym.el

diff --git a/lisp/emulation/viper-keym.el b/lisp/emulation/viper-keym.el
index 9dd78ce8aa132c3d0842af9ed8100135e06324e5..0e502720f5e7b3726c70d7d728630d8b0772ff05 100644 (file)
--- a/lisp/emulation/viper-keym.el
+++ b/lisp/emulation/viper-keym.el
@@ -9,7 +9,7 @@
 
 ;; GNU Emacs 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 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
@@ -170,7 +170,7 @@ Enter as a sexp.  Examples: \"\\C-z\", [(control ?z)]."
         (let ((old-value (if (boundp 'viper-toggle-key)
                              viper-toggle-key
                            [(control ?z)])))
-          (mapcar
+          (mapc
            (lambda (buf)
              (save-excursion
                (set-buffer buf)
@@ -210,7 +210,7 @@ If running in a terminal, [(escape)] is not understood, so must use \"\\e\"."
         (let ((old-value (if (boundp 'viper-ESC-key)
                              viper-ESC-key
                            [(escape)])))
-          (mapcar
+          (mapc
            (lambda (buf)
              (save-excursion
                (set-buffer buf)
@@ -339,8 +339,8 @@ If running in a terminal, [(escape)] is not understood, so must use \"\\e\"."
 (define-key viper-vi-basic-map "\C-m" 'viper-next-line-at-bol)
 (define-key viper-vi-basic-map "\C-u" 'viper-scroll-down)
 (define-key viper-vi-basic-map "\C-y" 'viper-scroll-down-one)
-(define-key viper-vi-basic-map "\C-s" 'viper-isearch-forward)
-(define-key viper-vi-basic-map "\C-r" 'viper-isearch-backward)
+;;(define-key viper-vi-basic-map "\C-s" 'viper-isearch-forward)
+;;(define-key viper-vi-basic-map "\C-r" 'viper-isearch-backward)
 (define-key viper-vi-basic-map "\C-c/" 'viper-toggle-search-style)
 (define-key viper-vi-basic-map "\C-c\C-g" 'viper-info-on-file)