APPROVE COMMIT W3
NOTE: This patch has been committed. Thank you Mats and the XEmacs package
smoketest.
# HG changeset patch
# User Aidan Kehoe <kehoea(a)parhasard.net>
# Date 1337077804 -3600
# Node ID c6c39f2ef647b9cfd97f0f6f838bc99d1d7117d5
# Parent 59e99a00a59ffa39e51bb866ca30f2ec426459ee
Check for the menubar feature before calling #'custom-menu-create, w3-menu.el
lisp/ChangeLog addition:
2012-05-15 Aidan Kehoe <kehoea(a)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.
diff -r 59e99a00a59f -r c6c39f2ef647 ChangeLog
--- a/ChangeLog Fri May 11 16:52:15 2012 +0200
+++ b/ChangeLog Tue May 15 11:30:04 2012 +0100
@@ -1,3 +1,10 @@
+2012-05-15 Aidan Kehoe <kehoea(a)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(a)xemacs.org>
* Makefile (VERSION): XEmacs package 1.37 released.
diff -r 59e99a00a59f -r c6c39f2ef647 lisp/w3-menu.el
--- a/lisp/w3-menu.el Fri May 11 16:52:15 2012 +0200
+++ b/lisp/w3-menu.el Tue May 15 11:30:04 2012 +0100
@@ -311,10 +311,12 @@
"----"
(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])
)
--
‘Liston operated so fast that he once accidentally amputated an assistant’s
fingers along with a patient’s leg, […] The patient and the assistant both
died of sepsis, and a spectator reportedly died of shock, resulting in the
only known procedure with a 300% mortality.’ (Atul Gawande, NEJM, 2012)
_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches(a)xemacs.org
http://lists.xemacs.org/mailman/listinfo/xemacs-patches