Index: vc-hooks.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/vc/vc-hooks.el,v
retrieving revision 1.15
diff -u -r1.15 vc-hooks.el
--- vc-hooks.el	28 Oct 2007 17:46:57 -0000	1.15
+++ vc-hooks.el	28 Feb 2009 11:19:16 -0000
@@ -935,7 +935,7 @@
 (defconst vc-menu
   '("Version Control"
     :filter vc-menu-filter
-    [""                           vc-next-action          buffer-file-name nil]
+    ["Next Action on"             vc-next-action          buffer-file-name nil]
     ["Update to Latest Version"   vc-update               vc-mode]
     ["Revert to Base Version"     vc-revert-buffer        vc-mode]
     ["Undo Last Check-In"         vc-cancel-version       vc-mode]
@@ -956,48 +956,15 @@
 
 (defun vc-menu-filter (menu-items)
   (let* ((result menu-items)		; modify in-place
-	 (case-fold-search t)
-	 (type (vc-backend buffer-file-name))
 	 ;; VC works with full path!
-	 (file (if buffer-file-name
-		   buffer-file-name
-		 (expand-file-name (buffer-name))))
-	 op owner item status)
-    (setq op (cond ((null type)
-		    "Register File")
-		   ((eq type 'CVS)
-		    (setq status
-			  (vc-file-getprop buffer-file-name 'cvs-status))
-		    (if status
-			(cdr (assoc status
-				    '(("Locally Modified" . "Commit")
-				      ("Needs Merge" . "Merge with repository")
-				      ("Up-to-date" . "Do nothing to")
-				      ("Needs Checkout" . "Update"))))
-		      ;; #### - we're not gonna call cvs status just to
-		      ;; post a lousy menu...that's insane!
-		      "Next action on" 
-		      ))
-		   ;; these are all for RCS and SCCS
-		   ((not (setq owner (vc-locking-user file)))
-		    ;; VC locking user is faster now. vc-file-owner
-		    ;; is superceded by incompatible FSF version (JV).
-		    "Check out File")
-		   ((not (string-equal owner (user-login-name)))
-		    "Steal File Lock")
-		   (t "Check in File")))
+	 (file (or buffer-file-name (expand-file-name (buffer-name))))
+	 item)
     ;; We do not want the full name in the menu
     (setq file (file-name-nondirectory file))
     (while (setq item (pop menu-items))
       (and (vectorp item)
-	   (cond ((eq 'vc-next-action (aref item 1))
-		  (aset item 0 op)
-		  (aset item 3 file))
-		 ((eq 'vc-file-status (aref item 1))
-		  (aset item 2 (eq 'CVS type))
-		  (aset item 3 file))
-		 ((> (length item) 3)
-		  (aset item 3 file)))))
+	   (> (length item) 3)
+	   (aset item 3 file)))
     result))
 
 (and (featurep 'menubar)