mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-02-04 14:40:54 -08:00
Code Issues Projects Releases Wiki Activity

(vc-menu-map): Don't setup any more.

Browse source 
Instead, just create the proper spot in the menu.
This commit is contained in:
Stefan Monnier 2007-08-21 15:08:47 +00:00
parent e2247dc840
commit dc172b7323
2 changed files with 4 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

3
lisp/ChangeLog
View file

@ -6,6 +6,9 @@
(vc-menu-map): Declare and initialize in one step.
(vc-menu-map-filter): Move&rename from menu-bar.el:menu-bar-vc-filter
* menu-bar.el (vc-menu-map): Don't setup any more.
Instead, just create the proper spot in the menu.
2007-08-20 Stefan Monnier <monnier@iro.umontreal.ca>
* smerge-mode.el (smerge-resolve): New arg `safe'.

17
lisp/menu-bar.el
View file

@ -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]
'("--"))