Tweak previous change.

[gnu-emacs] / lisp / vc-dir.el

diff --git a/lisp/vc-dir.el b/lisp/vc-dir.el
index 6818b3a99d85d21c0242ec8ea1669003046185b3..1f91ff4d3796a02f49bd5e0608c33d2a0e51ab92 100644 (file)
--- 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 ()
@@ -877,13 +876,13 @@ If it is a file, return the corresponding cons for the file itself."
 (define-derived-mode vc-dir-mode special-mode "VC dir"
   "Major mode for VC directory buffers.
 Marking/Unmarking key bindings and actions:
-m - marks a file/directory or if the region is active, mark all the files
-     in region.
+m - mark a file/directory
+  - if the region is active, mark all the files in region.
     Restrictions: - a file cannot be marked if any parent directory is marked
                   - a directory cannot be marked if any child file or
                     directory is marked
-u - marks a file/directory or if the region is active, unmark all the files
-     in region.
+u - unmark a file/directory
+  - if the region is active, unmark all the files in region.
 M - if the cursor is on a file: mark all the files with the same state as
       the current file
   - if the cursor is on a directory: mark all child files
@@ -892,10 +891,12 @@ U - if the cursor is on a file: unmark all the files with the same state
       as the current file
   - if the cursor is on a directory: unmark all child files
   - with a prefix argument: unmark all files
+mouse-2  - toggles the mark state
 
 VC commands
-VC commands in the `C-x v' can be used, they act on the marked
-entries, or on the current entry if nothing is marked.
+VC commands in the `C-x v' prefix can be used.
+VC commands act on the marked entries.  If nothing is marked, VC
+commands act on the current entry.
 
 Search & Replace
 S - searches the marked files
@@ -904,8 +905,8 @@ M-s a C-s - does an isearch on the marked files
 M-s a C-M-s - does a regexp isearch on the marked files
 If nothing is marked, these commands act on the current entry.
 When a directory is current or marked, the Search & Replace
-commands act on the files in those directories displayed in the
-*vc-dir* buffer.
+commands act on the child files of that directory that are displayed in
+the *vc-dir* buffer.
 
 \\{vc-dir-mode-map}"
   (set (make-local-variable 'vc-dir-backend) use-vc-backend)
@@ -1144,13 +1145,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 +1171,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)