new version

2 files changed, 3 insertions, 6 deletions

diff --git a/lisp/emulation/viper-keym.el b/lisp/emulation/viper-keym.el
index 9ff82875e5b..3da13594e0d 100644
--- a/lisp/emulation/viper-keym.el
+++ b/lisp/emulation/viper-keym.el
@@ -452,10 +452,6 @@ Useful in some modes, such as Gnus, MH, etc.")
 (define-key viper-dired-modifier-map ":" 'viper-ex)
 (define-key viper-dired-modifier-map "/" 'viper-search-forward)
 
-(defvar viper-help-modifier-map (make-sparse-keymap)
-  "This map modifies Help mode behavior.")
-(define-key viper-help-modifier-map "q" (if viper-xemacs-p 'help-mode-quit))
-
 
 
 ;;; Code
diff --git a/lisp/emulation/viper.el b/lisp/emulation/viper.el
index f0643339510..3c43a2de875 100644
--- a/lisp/emulation/viper.el
+++ b/lisp/emulation/viper.el
@@ -630,9 +630,10 @@ remains buffer-local."
   (defvar makefile-mode-hook)
   (add-hook 'makefile-mode-hook 'viper-mode)
 
+  ;; Help mode is now for viewing only
   (defvar help-mode-hook)
-  (add-hook 'help-mode-hook 'viper-mode)
-  (viper-modify-major-mode 'help-mode 'vi-state viper-help-modifier-map)
+  (add-hook 'help-mode-hook 'viper-change-state-to-emacs)
+  (viper-modify-major-mode 'help-mode 'emacs-state viper-slash-and-colon-map)
 
   (defvar awk-mode-hook)
   (add-hook 'awk-mode-hook 'viper-mode)