Mercurial > emacs
comparison lisp/menu-bar.el @ 91005:424b655804ca
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 846-851)
- Update from CVS
- Merge from emacs--rel--22
* emacs--rel--22 (patch 88-92)
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 242-244)
- Update from CVS
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-246
author | Miles Bader <miles@gnu.org> |
---|---|
date | Mon, 13 Aug 2007 13:48:35 +0000 |
parents | cd5e99697764 7dbd61707d6c |
children | aaccdab0ee26 |
comparison
equal
deleted
inserted
replaced
91004:f72cf5b2ab11 | 91005:424b655804ca |
---|---|
1168 (list 'menu-item "Version Control" vc-menu-map | 1168 (list 'menu-item "Version Control" vc-menu-map |
1169 :filter 'menu-bar-vc-filter)) | 1169 :filter 'menu-bar-vc-filter)) |
1170 | 1170 |
1171 (defun menu-bar-vc-filter (orig-binding) | 1171 (defun menu-bar-vc-filter (orig-binding) |
1172 (let ((ext-binding | 1172 (let ((ext-binding |
1173 (if vc-mode (vc-call 'extra-menu buffer-file-name)))) | 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 | 1174 ;; Give the VC backend a chance to add menu entries |
1175 ;; specific for that backend. | 1175 ;; specific for that backend. |
1176 (if (null ext-binding) | 1176 (if (null ext-binding) |
1177 orig-binding | 1177 orig-binding |
1178 (append orig-binding | 1178 (append orig-binding |