[Emacs-diffs] Changes to emacs/lisp/menu-bar.el,v

[Stefan Monnier]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Stefan Monnier <monnier>        07/08/21 15:08:49

Index: menu-bar.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/menu-bar.el,v
retrieving revision 1.308
retrieving revision 1.309
diff -u -b -r1.308 -r1.309
--- menu-bar.el 16 Aug 2007 00:10:39 -0000      1.308
+++ menu-bar.el 21 Aug 2007 15:08:47 -0000      1.309
@@ -1160,24 +1160,9 @@
 (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]
   '("--"))