Mercurial > emacs

diff lisp/menu-bar.el @ 91015:b83d0dadb2a7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from emacs--devo--0 Patches applied: * emacs--devo--0 (patch 857-865) - Update from CVS - Merge from emacs--rel--22 - Update from CVS: lisp/emacs-lisp/avl-tree.el: New file. - Remove RCS keywords * emacs--rel--22 (patch 97-100) - Update from CVS - Merge from gnus--rel--5.10 * gnus--rel--5.10 (patch 246-247) - Update from CVS Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-252
author Miles Bader <miles@gnu.org>
date Wed, 29 Aug 2007 05:03:40 +0000
parents aaccdab0ee26 029c5ed25e99
children 14c4a6aac623
line wrap: on
line diff
--- a/lisp/menu-bar.el	Thu Aug 23 12:13:43 2007 +0000
+++ b/lisp/menu-bar.el	Wed Aug 29 05:03:40 2007 +0000
@@ -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]
   '("--"))