[Emacs-diffs] Changes to emacs/lisp/vc.el,v

[Sam Steingold]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Sam Steingold <sds>     08/04/18 14:24:51

Index: vc.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/vc.el,v
retrieving revision 1.585
retrieving revision 1.586
diff -u -b -r1.585 -r1.586
--- vc.el       16 Apr 2008 04:58:34 -0000      1.585
+++ vc.el       18 Apr 2008 14:24:50 -0000      1.586
@@ -2021,6 +2021,7 @@
               log-entry))
     ;; Remove checkin window (after the checkin so that if that fails
     ;; we don't zap the *VC-log* buffer and the typing therein).
+    ;; -- IMO this should be replaced with quit-window
     (let ((logbuf (get-buffer "*VC-log*")))
       (cond ((and logbuf vc-delete-logbuf-window)
             (delete-windows-on logbuf (selected-frame))
@@ -2805,7 +2806,7 @@
 (defvar vc-dir-menu-map
   (let ((map (make-sparse-keymap "VC-dir")))
     (define-key map [quit]
-      '(menu-item "Quit" bury-buffer
+      '(menu-item "Quit" quit-window
                  :help "Quit"))
     (define-key map [kill]
       '(menu-item "Kill Update Command" vc-dir-kill-dir-status-process
@@ -2924,12 +2925,13 @@
     (define-key map "\C-m" 'vc-dir-find-file)
     (define-key map "o" 'vc-dir-find-file-other-window)
     (define-key map "x" 'vc-dir-hide-up-to-date)
-    (define-key map "q" 'bury-buffer)
+    (define-key map "q" 'quit-window)
     (define-key map "g" 'vc-dir-refresh)
     (define-key map "\C-c\C-c" 'vc-dir-kill-dir-status-process)
-    ;; Not working yet.  Functions like vc-dir-find-file need to
-    ;; find the file from the mouse position, not `point'.
+    ;; Does not work unless mouse sets point.  Functions like vc-dir-find-file
+    ;; need to find the file from the mouse position, not `point'.
     ;; (define-key map [(down-mouse-3)] 'vc-dir-menu)
+    ;; (define-key map [(mouse-2)] 'vc-dir-toggle-mark)
 
     ;; Hook up the menu.
     (define-key map [menu-bar vc-dir-mode]
@@ -2983,7 +2985,7 @@
                                   "search" map)
     (tool-bar-local-item-from-menu 'vc-dir-kill-dir-status-process "cancel"
                                   map vc-dir-mode-map)
-    (tool-bar-local-item-from-menu 'bury-buffer "exit"
+    (tool-bar-local-item-from-menu 'quit-window "exit"
                                   map vc-dir-mode-map)
     map))