*** dist/vm-menu.el.dist	Sat Jun 23 18:57:59 2001
--- vm-menu.el	Sun Jul  1 14:14:45 2001
***************
*** 383,391 ****
       ;; FSF Emacs does not allow a non-string menu element name.
!      (if vm-xemacs-p
! 	 (list [(or (format "Convert to %s and Display"
! 			    (nth 1 (vm-mime-can-convert
! 				    (car
! 				     (vm-mm-layout-type
! 				      (vm-mime-get-button-layout e))))))
! 		    "different type")
  		(vm-mime-run-display-function-at-point
--- 383,391 ----
       ;; FSF Emacs does not allow a non-string menu element name.
!      (if (vm-menu-can-eval-item-name)
! 	 (list [(format "Convert to %s and Display"
! 			(or (nth 1 (vm-mime-can-convert
! 				(car
! 				 (vm-mm-layout-type
! 				  (vm-mime-get-button-layout e)))))
! 			    "different type"))
  		(vm-mime-run-display-function-at-point
*** dist/vm-startup.el.dist	Sat Jun 23 18:58:00 2001
--- vm-startup.el	Mon Jul  9 12:00:49 2001
***************
*** 344,346 ****
  
! This is VM 6.93.
  
--- 344,346 ----
  
! This is VM 6.94.
  
*** dist/vm-version.el.dist	Sat Jun 23 18:58:00 2001
--- vm-version.el	Mon Jul  9 12:00:49 2001
***************
*** 4,6 ****
  
! (defconst vm-version "6.93"
    "Version number of VM.")
--- 4,6 ----
  
! (defconst vm-version "6.94"
    "Version number of VM.")
***************
*** 54,55 ****
--- 54,62 ----
         (fboundp 'set-buffer-menubar)))
+ 
+ (defun vm-menu-can-eval-item-name ()
+   (and vm-xemacs-p
+        (fboundp 'check-menu-syntax)
+        (condition-case nil
+ 	   (check-menu-syntax '("bar" ((identity "foo") 'ding t)))
+ 	 (error nil))))