# HG changeset patch
# User Michael Kifer <kifer@cs.stonybrook.edu>
# Date 1010597595 0
# Node ID 867207acffeb4c31f1e61ae2128f1af0dab7192b
# Parent  c0f9dbfc8232f1223e13528fbd4fb1b0d649f5ab
2002-01-09  Michael Kifer  <kifer@cs.stonybrook.edu>

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

diff -r c0f9dbfc8232 -r 867207acffeb lisp/ChangeLog
--- a/lisp/ChangeLog	Wed Jan 09 16:25:26 2002 +0000
+++ b/lisp/ChangeLog	Wed Jan 09 17:33:15 2002 +0000
@@ -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 -r c0f9dbfc8232 -r 867207acffeb lisp/emulation/viper.el
--- a/lisp/emulation/viper.el	Wed Jan 09 16:25:26 2002 +0000
+++ b/lisp/emulation/viper.el	Wed Jan 09 17:33:15 2002 +0000
@@ -828,6 +828,13 @@
   (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)