Commits

Aidan Kehoe  committed c6c39f2

Check for the menubar feature before calling #'custom-menu-create, w3-menu.el

lisp/ChangeLog addition:

2012-05-15 Aidan Kehoe <kehoea@parhasard.net>

* lisp/w3-menu.el (w3-menu-edit-menu):
Check for the menubar or menu-bar feature before calling
#'custom-menu-create, making building with a headless XEmacs
practical.

  • Participants
  • Parent commits 59e99a0

Comments (0)

Files changed (2)

+2012-05-15  Aidan Kehoe  <kehoea@parhasard.net>
+
+	* lisp/w3-menu.el (w3-menu-edit-menu):
+	Check for the menubar or menu-bar feature before calling
+	#'custom-menu-create, making building with a headless XEmacs
+	practical.
+
 2012-05-11  Norbert Koch  <viteno@xemacs.org>
 
 	* Makefile (VERSION): XEmacs package 1.37 released.

File lisp/w3-menu.el

    "----"
    (list
     "Preferences"
-    (if (fboundp 'custom-menu-create)
+    (if (and (fboundp 'custom-menu-create) (or (featurep 'menubar)
+                                               (featurep 'menu-bar)))
 	(custom-menu-create 'w3)
       ["W3" ignore nil])
-    (if (fboundp 'custom-menu-create)
+    (if (and (fboundp 'custom-menu-create) (or (featurep 'menubar)
+                                               (featurep 'menu-bar)))
 	(custom-menu-create 'url)
       ["URL" ignore nil])
     )