(vc-menu-map): Don't setup any more.

Instead, just create the proper spot in the menu.

2 files changed, 4 insertions, 16 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 11703054d4f..31e50780b0d 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -6,6 +6,9 @@
         (vc-menu-map): Declare and initialize in one step.
         (vc-menu-map-filter): Move&rename from menu-bar.el:menu-bar-vc-filter
 
+        * menu-bar.el (vc-menu-map): Don't setup any more.
+        Instead, just create the proper spot in the menu.
+
 2007-08-20  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * smerge-mode.el (smerge-resolve): New arg `safe'.
diff --git a/lisp/menu-bar.el b/lisp/menu-bar.el
index fcf11f05314..148e5916097 100644
--- a/lisp/menu-bar.el
+++ b/lisp/menu-bar.el
@@ -1160,24 +1160,9 @@ mail status in mode line"))
 (define-key menu-bar-tools-menu [separator-vc]
   '("--"))
 
-(defvar vc-menu-map (make-sparse-keymap "Version Control"))
-(defalias 'vc-menu-map vc-menu-map)
 (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
-  :filter 'menu-bar-vc-filter))
-
-(defun menu-bar-vc-filter (orig-binding)
-  (let ((ext-binding
-   (if vc-mode (vc-call-backend (vc-backend buffer-file-name) 'extra-menu))))
-    ;; Give the VC backend a chance to add menu entries
-    ;; specific for that backend.
-    (if (null ext-binding)
-    orig-binding
-      (append orig-binding
-              '((ext-menu-separator "---"))
-                    ext-binding))))
+(define-key menu-bar-tools-menu [vc] nil) ;Create the place for the VC menu.
 
 (define-key menu-bar-tools-menu [separator-compare]
   '("--"))