* lisp/emulation/viper.el (viper-set-hooks): Declare.

2 files changed, 5 insertions, 2 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 3f050faee13..3c8e1dcd8e6 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
 2011-05-24  Glenn Morris  <rgm@gnu.org>
 
+        * emulation/viper.el (viper-set-hooks): Declare.
+
         * play/5x5.el (5x5-log-init, 5x5-log): Evaluate when compiling.
         (5x5-log-init, 5x5-log, 5x5-solver): Doc fixes.
         (math-map-vec, math-sub, math-mul, math-make-intv, math-reduce-vec)
diff --git a/lisp/emulation/viper.el b/lisp/emulation/viper.el
index 1057eb00cdd..38a881845df 100644
--- a/lisp/emulation/viper.el
+++ b/lisp/emulation/viper.el
@@ -1,4 +1,4 @@
-;;; viper.el --- A full-featured Vi emulator for GNU Emacs and XEmacs,
+;;; viper.el --- A full-featured Vi emulator for Emacs and XEmacs,
 ;;               a VI Plan for Emacs Rescue,
 ;;               and a venomous VI PERil.
 ;;               Viper Is also a Package for Emacs Rebels.
@@ -547,7 +547,7 @@ If Viper is enabled, turn it off.  Otherwise, turn it on."
                       "Viper Is a Package for Emacs Rebels,
 a VI Plan for Emacs Rescue, and a venomous VI PERil.
 
-Incidentally, Viper emulates Vi under GNU Emacs 20 and XEmacs 20.
+Incidentally, Viper emulates Vi under Emacs/XEmacs 20.
 It supports all of what is good in Vi and Ex, while extending
 and improving upon much of it.
 
@@ -850,6 +850,7 @@ It also can't undo some Viper settings."
   ;; Zap bad bindings in flyspell-mouse-map, which prevent ESC from working
   ;; over misspelled words (due to the overlay keymaps)
   (defvar flyspell-mode-hook)
+  (defvar flyspell-mouse-map)
   (add-hook 'flyspell-mode-hook
             (lambda ()
               (define-key flyspell-mouse-map viper-ESC-key nil)))