[Emacs-diffs] emacs/lisp ChangeLog vc-dir.el

[Dan Nicolaescu]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Dan Nicolaescu <dann>   09/01/31 17:26:57

Modified files:
        lisp           : ChangeLog vc-dir.el 

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

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.15231&r2=1.15232
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/vc-dir.el?cvsroot=emacs&r1=1.32&r2=1.33

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.15231
retrieving revision 1.15232
diff -u -b -r1.15231 -r1.15232
--- ChangeLog   31 Jan 2009 17:00:54 -0000      1.15231
+++ ChangeLog   31 Jan 2009 17:26:53 -0000      1.15232
@@ -9,6 +9,11 @@
 
 2009-01-31  Dan Nicolaescu  <address@hidden>
 
+       * 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.
 

Index: vc-dir.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/vc-dir.el,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -b -r1.32 -r1.33
--- vc-dir.el   31 Jan 2009 02:18:21 -0000      1.32
+++ vc-dir.el   31 Jan 2009 17:26:56 -0000      1.33
@@ -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)