(vc-dir-mouse-map):

(vc-default-dir-printer):
(vc-dir-find-file-other-window): Undo previous change, it breaks
the behavior of mouse-2.

2 files changed, 8 insertions, 12 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 20721dab090..ce946defe5a 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -9,6 +9,11 @@
 
 2009-01-31  Dan Nicolaescu  <dann@ics.uci.edu>
 
+        * vc-dir.el (vc-dir-mouse-map):
+        (vc-default-dir-printer):
+        (vc-dir-find-file-other-window): Undo previous change, it breaks
+        the behavior of mouse-2.
+
         * vc-svn.el (vc-svn-dir-status): Disable the vc-stay-local-p
         logic, it makes the makes the normal case too slow.
 
diff --git a/lisp/vc-dir.el b/lisp/vc-dir.el
index 6818b3a99d8..249ceec75f9 100644
--- a/lisp/vc-dir.el
+++ b/lisp/vc-dir.el
@@ -689,10 +689,9 @@ that share the same state."
   (interactive)
   (find-file (vc-dir-current-file)))
 
-(defun vc-dir-find-file-other-window (&optional event)
+(defun vc-dir-find-file-other-window ()
   "Find the file on the current line, in another window."
-  (interactive (list last-input-event))
-  (if event (posn-set-point (event-end event)))
+  (interactive)
   (find-file-other-window (vc-dir-current-file)))
 
 (defun vc-dir-isearch ()
@@ -1144,13 +1143,6 @@ Interactively, a prefix argument means to ask for the backend."
    (propertize "Please add backend specific headers here.  It's easy!"
                'face 'font-lock-warning-face)))
 
-;; Keep existing map.
-(defvar vc-dir-mouse-map
-  (let ((map vc-dir-mode-map))
-    (define-key map [mouse-2] 'vc-dir-find-file-other-window)
-    map)
-  "Local keymap for visiting a file.")
-
 (defun vc-default-dir-printer (backend fileentry)
   "Pretty print FILEENTRY."
   ;; If you change the layout here, change vc-dir-move-to-goal-column.
@@ -1177,8 +1169,7 @@ Interactively, a prefix argument means to ask for the backend."
       (if isdir
           "Directory\nVC operations can be applied to it\nmouse-3: Pop-up menu"
         "File\nmouse-3: Pop-up menu")
-      'mouse-face 'highlight
-      'local-map vc-dir-mouse-map))))
+      'mouse-face 'highlight))))
 
 (defun vc-default-extra-status-menu (backend)
   nil)