comparison lisp/vc.el @ 94698:8983ac9b89b4

Back out menu move, it broke something obscure.

94697:f8e080083e06

	(define-key map "+" 'vc-update) ;; C-x v +
	(define-key map "R" 'vc-revert) ;; u is taken by dispatcher unmark.
	(define-key map "A" 'vc-annotate) ;; g is taken by dispatcher referesh
	(define-key map "l" 'vc-print-log) ;; C-x v l
	(define-key map "x" 'vc-dir-hide-up-to-date))
      ;; Add VC-specific context menu items
      (let ((map right-menu-map))
	;; VC info details
	(define-key map [sepvcdet] '("--"))
	(define-key map [remup]
	  '(menu-item "Hide up-to-date" vc-dir-hide-up-to-date
		      :help "Hide up-to-date items from display"))
	;; FIXME: This needs a key binding.  And maybe a better name
	;; ("Insert" like PCL-CVS uses does not sound that great either)...
	(define-key map [ins]
	  '(menu-item "Show File" vc-dir-show-fileentry
		      :help "Show a file in the VC status listing even though it might be up to date"))
	(define-key map [annotate]
	  '(menu-item "Annotate" vc-annotate
		      :help "Display the edit history of the current file using colors"))
	(define-key map [diff]
	  '(menu-item "Compare with Base Version" vc-diff
		      :help "Compare file set with the base version"))
	(define-key map [log]
	  '(menu-item "Show history" vc-print-log
		      :help "List the change log of the current file set in a window"))
	;; VC commands.
	(define-key map [sepvccmd] '("--"))
	(define-key map [update]
	  '(menu-item "Update to latest version" vc-update
		      :help "Update the current fileset's files to their tip revisions"))
	(define-key map [revert]
	  '(menu-item "Revert to base version" vc-revert
		      :help "Revert working copies of the selected fileset to their repository contents."))
	(define-key map [next-action]
	  ;; FIXME: This really really really needs a better name!
	  ;; And a key binding too.
	  '(menu-item "Check In/Out" vc-next-action
		      :help "Do the next logical version control operation on the current fileset"))
	(define-key map [register]
	  '(menu-item "Register" vc-dir-register
		      :help "Register file set into the version control system")))
      ;; Hook up the menu.
      (define-key (current-local-map) [menu-bar vc-dir-mode]
	'(menu-item
	  ;; This is used so that back ends can add mode-specific
	  ;; menu items to vc-dir-menu-map.
	  "VC Status" vc-dir-menu-map :filter vc-dir-menu-map-filter))
      )))

;; Named-configuration entry points

(defun vc-snapshot-precondition (dir)

94698:8983ac9b89b4

	(define-key map "+" 'vc-update) ;; C-x v +
	(define-key map "R" 'vc-revert) ;; u is taken by dispatcher unmark.
	(define-key map "A" 'vc-annotate) ;; g is taken by dispatcher referesh
	(define-key map "l" 'vc-print-log) ;; C-x v l
	(define-key map "x" 'vc-dir-hide-up-to-date))
      )))

;; Named-configuration entry points

(defun vc-snapshot-precondition (dir)