[COMMIT W3] Avoid calling menu-specific code at compile time if no menubar, W3.

APPROVE COMMIT NOTE: This patch has been committed. # HG changeset patch # User Aidan Kehoe <kehoea(a)parhasard.net&gt; # Date 1325332215 0 # Node ID f51cb68fb287851d52ed2a4cee12284269871056 # Parent 621158a6588ceb574a3299323f4398fb8534441d Avoid calling menu-specific code at compile time if no menubar, W3. ChangeLog addition: 2011-12-31 Aidan Kehoe <kehoea(a)parhasard.net&gt; * lisp/w3-menu.el (w3-menu-edit-menu): Only call #'custom-menu-create if the menubar is available; avoids compilation problems when this code is evaluated as a result of (require 'w3-menu). diff -r 621158a6588c -r f51cb68fb287 ChangeLog --- a/ChangeLog Sat Sep 03 14:53:33 2011 +0200 +++ b/ChangeLog Sat Dec 31 11:50:15 2011 +0000 ＠＠ -1,3 +1,10 ＠＠ +2011-12-31 Aidan Kehoe <kehoea(a)parhasard.net&gt; + + * lisp/w3-menu.el (w3-menu-edit-menu): + Only call #'custom-menu-create if the menubar is available; avoids + compilation problems when this code is evaluated as a result of + (require 'w3-menu). + 2008-07-23 Norbert Koch <viteno(a)xemacs.org&gt; * Makefile (VERSION): XEmacs package 1.35 released. diff -r 621158a6588c -r f51cb68fb287 lisp/w3-menu.el --- a/lisp/w3-menu.el Sat Sep 03 14:53:33 2011 +0200 +++ b/lisp/w3-menu.el Sat Dec 31 11:50:15 2011 +0000 ＠＠ -300,10 +300,10 ＠＠ "----" (list "Preferences" - (if (fboundp 'custom-menu-create) + (if (and (featurep 'menubar) (fboundp 'custom-menu-create)) (custom-menu-create 'w3) ["W3" ignore nil]) - (if (fboundp 'custom-menu-create) + (if (and (featurep 'menubar) (fboundp 'custom-menu-create)) (custom-menu-create 'url) ["URL" ignore nil]) ) -- ‘Iodine deficiency was endemic in parts of the UK until, through what has been described as “an unplanned and accidental public health triumph”, iodine was added to cattle feed to improve milk production in the 1930s.’ (EN Pearce, Lancet, June 2011) _______________________________________________ XEmacs-Patches mailing list XEmacs-Patches(a)xemacs.org http://lists.xemacs.org/mailman/listinfo/xemacs-patches