Mercurial > emacs
comparison lisp/menu-bar.el @ 83649:b210fca2fe6e
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 839-842)
- Update from CVS
- Change capitalization of VC backend names for new backends
Revision: emacs@sv.gnu.org/emacs--multi-tty--0--patch-29
author | Miles Bader <miles@gnu.org> |
---|---|
date | Fri, 03 Aug 2007 05:27:43 +0000 |
parents | 65663fcd2caa 58ac5a791dfa |
children | 984b1dfd7601 |
comparison
equal
deleted
inserted
replaced
83648:65663fcd2caa | 83649:b210fca2fe6e |
---|---|
1163 (defvar vc-menu-map (make-sparse-keymap "Version Control")) | 1163 (defvar vc-menu-map (make-sparse-keymap "Version Control")) |
1164 (defalias 'vc-menu-map vc-menu-map) | 1164 (defalias 'vc-menu-map vc-menu-map) |
1165 (define-key menu-bar-tools-menu [pcl-cvs] | 1165 (define-key menu-bar-tools-menu [pcl-cvs] |
1166 '(menu-item "PCL-CVS" cvs-global-menu)) | 1166 '(menu-item "PCL-CVS" cvs-global-menu)) |
1167 (define-key menu-bar-tools-menu [vc] | 1167 (define-key menu-bar-tools-menu [vc] |
1168 (list 'menu-item "Version Control" vc-menu-map)) | 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 'extra-menu buffer-file-name)))) | |
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)))) | |
1169 | 1181 |
1170 (define-key menu-bar-tools-menu [separator-compare] | 1182 (define-key menu-bar-tools-menu [separator-compare] |
1171 '("--")) | 1183 '("--")) |
1172 | 1184 |
1173 (define-key menu-bar-tools-menu [ediff-misc] | 1185 (define-key menu-bar-tools-menu [ediff-misc] |