[Emacs-diffs] Changes to emacs/lisp/vc-dispatcher.el,v

[Eric S. Raymond]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Eric S. Raymond <esr>   08/05/15 13:50:56

Index: vc-dispatcher.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/vc-dispatcher.el,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -b -r1.44 -r1.45
--- vc-dispatcher.el    15 May 2008 12:36:31 -0000      1.44
+++ vc-dispatcher.el    15 May 2008 13:50:54 -0000      1.45
@@ -656,14 +656,16 @@
                                      file-to-info
                                      file-to-state 
                                      file-to-extra
-                                     updater))
+                                     updater
+                                     extra-menu))
             (:conc-name vc-client-object->))
   name 
   headers
   file-to-info
   file-to-state 
   file-to-extra
-  updater)
+  updater
+  extra-menu)
 
 (defvar vc-ewoc nil)
 (defvar vc-dir-process-buffer nil
@@ -750,6 +752,19 @@
     map)
   "Menu for dispatcher status")
 
+;; This is used to that vlient modes can add mode-specific menu
+;; items to vc-dir-menu-map.
+(defun vc-dir-menu-map-filter (orig-binding)
+  (when (and (symbolp orig-binding) (fboundp orig-binding))
+    (setq orig-binding (indirect-function orig-binding)))
+  (let ((ext-binding
+        (funcall (vc-client-object->extra-menu vc-client-mode))))
+    (if (null ext-binding)
+       orig-binding
+      (append orig-binding
+             '("----")
+             ext-binding))))
+
 (defvar vc-dir-mode-map
   (let ((map (make-keymap)))
     (suppress-keymap map)
@@ -781,7 +796,6 @@
     (define-key map [(down-mouse-3)] 'vc-dir-menu)
     (define-key map [(mouse-2)] 'vc-dir-toggle-mark)
 
-    ;; FIXME: Calls back into vc.el
     ;; Hook up the menu.
     (define-key map [menu-bar vc-dir-mode]
       '(menu-item