--- a/lisp/viper/viper-mous.el	Mon Aug 13 09:00:04 2007 +0200
+++ b/lisp/viper/viper-mous.el	Mon Aug 13 09:02:59 2007 +0200
@@ -1,6 +1,6 @@
 ;;; viper-mous.el --- mouse support for Viper
 
-;; Copyright (C) 1994, 1995, 1996, 1997 Free Software Foundation, Inc.
+;; Copyright (C) 1994, 1995, 1996 Free Software Foundation, Inc.
 
 ;; This file is part of GNU Emacs.
 
@@ -21,28 +21,12 @@
 
 ;; Code
 
-(provide 'viper-mous)
+(require 'viper-util)
 
 ;; compiler pacifier
 (defvar double-click-time)
 (defvar mouse-track-multi-click-time)
-(defvar vip-search-start-marker)
-(defvar vip-local-search-start-marker)
-(defvar vip-search-history)
-(defvar vip-s-string)
-(defvar vip-re-search)
-
-(eval-when-compile
-  (let ((load-path (cons (expand-file-name ".") load-path)))
-    (or (featurep 'viper-util)
-	(load "viper-util.el" nil nil 'nosuffix))
-    (or (featurep 'viper)
-	(load "viper.el" nil nil 'nosuffix))
-    ))
-;; end pacifier
-
-(require 'viper-util)
-
+;; end compiler pacifier
 
 
 ;;; Variables
@@ -370,10 +354,8 @@
 				    vip-mouse-click-search-limit nil)))
 	      (goto-char (match-beginning 0))
 	      (message "Searching for: %s" vip-s-string)
-	      (if (<= arg 1) ; found the right occurrence of the pattern
-		  (progn
-		    (vip-adjust-window)
-		    (vip-flash-search-pattern)))
+	      (if (<= arg 1)
+		  (vip-flash-search-pattern))
 	      )
 	  (error (beep 1)
 		 (if (or (not (string= click-word previous-search-string))
@@ -469,4 +451,7 @@
        )))
 
 
+
+(provide 'viper-mous)
+
 ;;;  viper-mous.el ends here