2002-01-09 Michael Kifer <kifer@cs.stonybrook.edu>

	* viper.el (viper-set-hooks): zap viper-unfriendly bindings in
	flyspell-mouse-map.

2 files changed, 12 insertions, 0 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 01dd7bff8c9..e3124396d94 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2002-01-09  Michael Kifer  <kifer@cs.stonybrook.edu>
+        
+        * viper.el (viper-set-hooks): zap viper-unfriendly bindings in
+        flyspell-mouse-map.
+        
 2002-01-08  Richard M. Stallman  <rms@gnu.org>
 
         * emacs-lisp/regexp-opt.el (regexp-opt): Bind max-specpdl-size.
diff --git a/lisp/emulation/viper.el b/lisp/emulation/viper.el
index 7e1f47d3728..65c426da535 100644
--- a/lisp/emulation/viper.el
+++ b/lisp/emulation/viper.el
@@ -828,6 +828,13 @@ remains buffer-local."
   (defvar emerge-startup-hook)
   (add-hook 'emerge-startup-hook 'viper-change-state-to-emacs)
 
+  ;; Zap bad bindings in flyspell-mouse-map, which prevent ESC from working
+  ;; over misspelled words (due to the overlay keymaps)
+  (defvar flyspell-mode-hook)
+  (add-hook 'flyspell-mode-hook
+            '(lambda ()
+               (define-key flyspell-mouse-map viper-ESC-key nil)))
+
   ;; Tell vc-diff to put *vc* in Vi mode
   (if (featurep 'vc)
       (defadvice vc-diff (after viper-vc-ad activate)