# HG changeset patch # User Dan Nicolaescu # Date 1233422813 0 # Node ID 3f1db2aeea5aae5c2cbbd15a7f6711c2ad8c199d # Parent 79f16674b60be21555446cd3ea8d6a3c801a6dda (vc-dir-mouse-map): (vc-default-dir-printer): (vc-dir-find-file-other-window): Undo previous change, it breaks the behavior of mouse-2. diff -r 79f16674b60b -r 3f1db2aeea5a lisp/ChangeLog --- a/lisp/ChangeLog Sat Jan 31 17:00:54 2009 +0000 +++ b/lisp/ChangeLog Sat Jan 31 17:26:53 2009 +0000 @@ -9,6 +9,11 @@ 2009-01-31 Dan Nicolaescu + * 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 -r 79f16674b60b -r 3f1db2aeea5a lisp/vc-dir.el --- a/lisp/vc-dir.el Sat Jan 31 17:00:54 2009 +0000 +++ b/lisp/vc-dir.el Sat Jan 31 17:26:53 2009 +0000 @@ -689,10 +689,9 @@ (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 @@ (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 @@ (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)