summaryrefslogtreecommitdiff
path: root/lisp/menu-bar.el
diff options
context:
space:
mode:
authorDan Nicolaescu <dann@ics.uci.edu>2007-09-18 01:28:25 +0000
committerDan Nicolaescu <dann@ics.uci.edu>2007-09-18 01:28:25 +0000
commit793a22023e753cb9eddbde2d937b88026904f1a6 (patch)
tree3c09473fb6f71cd46cf9509547b0eb9b32d3baf9 /lisp/menu-bar.el
parent7262a148b6c23cd8c00d4c0e6a5c66410a98bf81 (diff)
downloademacs-793a22023e753cb9eddbde2d937b88026904f1a6.tar.gz
* vc-arch.el (vc-arch-extra-menu-map): New var and fun.
* vc-hooks.el (vc-menu-entry): New var. (vc-mode-line-map): Use it so that this menu also uses the extra-menu. (menu-bar-tools-menu): Add the VC menu here rather than in menu-bar.el. (vc-menu-map): Declare and initialize in one step. * menu-bar.el (vc-menu-map): Don't setup any more. Instead, just create the proper spot in the menu. * vc.el: Document new VC operation `extra-menu'. * vc-hooks.el (vc-default-extra-menu, vc-menu-map-filter): New function.
Diffstat (limited to 'lisp/menu-bar.el')
-rw-r--r--lisp/menu-bar.el4
1 files changed, 1 insertions, 3 deletions
diff --git a/lisp/menu-bar.el b/lisp/menu-bar.el
index 0c9ff964e30..eca8d40d7b3 100644
--- a/lisp/menu-bar.el
+++ b/lisp/menu-bar.el
@@ -1160,11 +1160,9 @@ mail status in mode line"))
(define-key menu-bar-tools-menu [separator-vc]
'("--"))
-(defvar vc-menu-map (make-sparse-keymap "Version Control"))
(define-key menu-bar-tools-menu [pcl-cvs]
'(menu-item "PCL-CVS" cvs-global-menu))
-(define-key menu-bar-tools-menu [vc]
- (list 'menu-item "Version Control" vc-menu-map))
+(define-key menu-bar-tools-menu [vc] nil) ;Create the place for the VC menu.
(define-key menu-bar-tools-menu [separator-compare]
'("--"))