diff options
| author | Miles Bader <miles@gnu.org> | 2007-08-27 09:21:49 +0000 |
|---|---|---|
| committer | Miles Bader <miles@gnu.org> | 2007-08-27 09:21:49 +0000 |
| commit | 62fb5e25f4a4c7da6fe6a06569b22a27998ae6bf (patch) | |
| tree | 9e21647ad3ab0f43ea02d372adc4cfa9947e5309 /lisp/menu-bar.el | |
| parent | 9005667b3381a785759a996e00fb1acfd126eecc (diff) | |
| parent | 83cc8d356afe3bfd68da74b822549e02047ed041 (diff) | |
| download | emacs-62fb5e25f4a4c7da6fe6a06569b22a27998ae6bf.tar.gz | |
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 857-862)
- Update from CVS
- Merge from emacs--rel--22
- Update from CVS: lisp/emacs-lisp/avl-tree.el: New file.
* 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--multi-tty--0--patch-38
Diffstat (limited to 'lisp/menu-bar.el')
| -rw-r--r-- | lisp/menu-bar.el | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/lisp/menu-bar.el b/lisp/menu-bar.el index 502f52b9b57..0c59c052369 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] '("--")) |