Move all the put's for menu-enable props to top level.

(vc-next-action, vc-toggle-read-only): Enable whenever vc-mode.

diff --git a/lisp/vc-hooks.el b/lisp/vc-hooks.el
index c255be1a93d0d08cf59df35d3e4b1398ca8a2cce..429a74cd32a7cb298c3eb9911addfafc08303636 100644 (file)
--- a/lisp/vc-hooks.el
+++ b/lisp/vc-hooks.el
@@ -1022,20 +1022,20 @@ Returns t if checkout was successful, nil otherwise."
     '("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-check-out] '("Check Out" . vc-toggle-read-only))
-  (define-key vc-menu-map [vc-register] '("Register" . vc-register))
-  (put 'vc-rename-file 'menu-enable 'vc-mode)
-  (put 'vc-version-other-window 'menu-enable 'vc-mode)
-  (put 'vc-diff 'menu-enable 'vc-mode)
-  (put 'vc-update-change-log 'menu-enable
-       '(eq (vc-buffer-backend) 'RCS))
-  (put 'vc-print-log 'menu-enable 'vc-mode)
-  (put 'vc-cancel-version 'menu-enable 'vc-mode)
-  (put 'vc-revert-buffer 'menu-enable 'vc-mode)
-  (put 'vc-insert-headers 'menu-enable 'vc-mode)
-  (put 'vc-next-action 'menu-enable '(and vc-mode (not buffer-read-only)))
-  (put 'vc-toggle-read-only 'menu-enable '(and vc-mode buffer-read-only))
-  (put 'vc-register 'menu-enable '(and buffer-file-name (not vc-mode)))
-  )
+  (define-key vc-menu-map [vc-register] '("Register" . vc-register)))
+
+(put 'vc-rename-file 'menu-enable 'vc-mode)
+(put 'vc-version-other-window 'menu-enable 'vc-mode)
+(put 'vc-diff 'menu-enable 'vc-mode)
+(put 'vc-update-change-log 'menu-enable
+     '(eq (vc-buffer-backend) 'RCS))
+(put 'vc-print-log 'menu-enable 'vc-mode)
+(put 'vc-cancel-version 'menu-enable 'vc-mode)
+(put 'vc-revert-buffer 'menu-enable 'vc-mode)
+(put 'vc-insert-headers '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)))
 
 (provide 'vc-hooks)