Commit 9314395d authored by André Spiegel's avatar André Spiegel
Browse files

(vc-menu-map): Replace entries for "Check In" and "Check Out" with

new entry "Check In/Out" (calling vc-next-action).
parent 7e6ed9b9
...@@ -1093,8 +1093,7 @@ Returns t if checkout was successful, nil otherwise." ...@@ -1093,8 +1093,7 @@ Returns t if checkout was successful, nil otherwise."
'("Revert to Last Version" . vc-revert-buffer)) '("Revert to Last Version" . vc-revert-buffer))
(define-key vc-menu-map [vc-insert-header] (define-key vc-menu-map [vc-insert-header]
'("Insert Header" . vc-insert-headers)) '("Insert Header" . vc-insert-headers))
(define-key vc-menu-map [vc-menu-check-in] '("Check In" . vc-next-action)) (define-key vc-menu-map [vc-next-action] '("Check In/Out" . vc-next-action))
(define-key vc-menu-map [vc-check-out] '("Check Out" . vc-toggle-read-only))
(define-key vc-menu-map [vc-register] '("Register" . vc-register))) (define-key vc-menu-map [vc-register] '("Register" . vc-register)))
(put 'vc-rename-file 'menu-enable 'vc-mode) (put 'vc-rename-file 'menu-enable 'vc-mode)
...@@ -1108,7 +1107,6 @@ Returns t if checkout was successful, nil otherwise." ...@@ -1108,7 +1107,6 @@ Returns t if checkout was successful, nil otherwise."
(put 'vc-revert-buffer 'menu-enable 'vc-mode) (put 'vc-revert-buffer 'menu-enable 'vc-mode)
(put 'vc-insert-headers 'menu-enable 'vc-mode) (put 'vc-insert-headers 'menu-enable 'vc-mode)
(put 'vc-next-action 'menu-enable 'vc-mode) (put 'vc-next-action 'menu-enable 'vc-mode)
(put 'vc-toggle-read-only 'menu-enable 'vc-mode)
(put 'vc-register 'menu-enable '(and buffer-file-name (not vc-mode))) (put 'vc-register 'menu-enable '(and buffer-file-name (not vc-mode)))
(provide 'vc-hooks) (provide 'vc-hooks)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment