Mercurial > emacs
comparison lisp/menu-bar.el @ 91015:b83d0dadb2a7
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 |
comparison
equal
deleted
inserted
replaced
91014:2392e6a45952 | 91015:b83d0dadb2a7 |
---|---|
1158 :help "Read network news groups")) | 1158 :help "Read network news groups")) |
1159 | 1159 |
1160 (define-key menu-bar-tools-menu [separator-vc] | 1160 (define-key menu-bar-tools-menu [separator-vc] |
1161 '("--")) | 1161 '("--")) |
1162 | 1162 |
1163 (defvar vc-menu-map (make-sparse-keymap "Version Control")) | |
1164 (defalias 'vc-menu-map vc-menu-map) | |
1165 (define-key menu-bar-tools-menu [pcl-cvs] | 1163 (define-key menu-bar-tools-menu [pcl-cvs] |
1166 '(menu-item "PCL-CVS" cvs-global-menu)) | 1164 '(menu-item "PCL-CVS" cvs-global-menu)) |
1167 (define-key menu-bar-tools-menu [vc] | 1165 (define-key menu-bar-tools-menu [vc] nil) ;Create the place for the VC menu. |
1168 (list 'menu-item "Version Control" vc-menu-map | |
1169 :filter 'menu-bar-vc-filter)) | |
1170 | |
1171 (defun menu-bar-vc-filter (orig-binding) | |
1172 (let ((ext-binding | |
1173 (if vc-mode (vc-call-backend (vc-backend buffer-file-name) 'extra-menu)))) | |
1174 ;; Give the VC backend a chance to add menu entries | |
1175 ;; specific for that backend. | |
1176 (if (null ext-binding) | |
1177 orig-binding | |
1178 (append orig-binding | |
1179 '((ext-menu-separator "---")) | |
1180 ext-binding)))) | |
1181 | 1166 |
1182 (define-key menu-bar-tools-menu [separator-compare] | 1167 (define-key menu-bar-tools-menu [separator-compare] |
1183 '("--")) | 1168 '("--")) |
1184 | 1169 |
1185 (define-key menu-bar-tools-menu [ediff-misc] | 1170 (define-key menu-bar-tools-menu [ediff-misc] |