diff lisp/vm/vm-misc.el @ 140:585fb297b004 r20-2b4

Import from CVS: tag r20-2b4
author cvs
date Mon, 13 Aug 2007 09:32:43 +0200
parents cca96a509cfe
children 2af401a6ecca
line wrap: on
line diff
--- a/lisp/vm/vm-misc.el	Mon Aug 13 09:31:48 2007 +0200
+++ b/lisp/vm/vm-misc.el	Mon Aug 13 09:32:43 2007 +0200
@@ -440,11 +440,11 @@
   (vm-multiple-frames-possible-p))
 
 (defun vm-menu-support-possible-p ()
-  (or (and (boundp 'window-system)
-	   (or (eq window-system 'x)
-	       (eq window-system 'ns)      ;; NextStep
-	       (eq window-system 'win32)))
-      (and (fboundp 'device-type) (eq (device-type) 'x))))
+  (cond (vm-xemacs-p
+	 (featurep 'menubar))
+	(vm-fsfemacs-19-p
+	 (fboundp 'menu-bar-mode))
+	(t nil)))
 
 (defun vm-toolbar-support-possible-p ()
   (and vm-xemacs-p