# HG changeset patch
# User wmperry
# Date 1018208174 0
# Node ID 7778a469a8ac6a7a3f15d0c4ef141c3d300f48c7
# Parent  0f42d0a176671633f962b0450fe5c2f6033a9c57
[xemacs-hg @ 2002-04-07 19:36:13 by wmperry]
Fix menubar-less builds.

diff -r 0f42d0a17667 -r 7778a469a8ac lisp/ChangeLog
--- a/lisp/ChangeLog	Sun Apr 07 17:10:50 2002 +0000
+++ b/lisp/ChangeLog	Sun Apr 07 19:36:14 2002 +0000
@@ -1,3 +1,8 @@
+2002-04-07  William M. Perry  <wmperry@gnu.org>
+
+	* startup.el (command-line): Don't call init-menubar-at-startup
+	unless we were built with menubar support.
+
 2002-03-19  Daiki Ueno  <daiki@xemacs.org>
 
 	* mule/japanese.el: Don't quote function expressions listed as
diff -r 0f42d0a17667 -r 7778a469a8ac lisp/startup.el
--- a/lisp/startup.el	Sun Apr 07 17:10:50 2002 +0000
+++ b/lisp/startup.el	Sun Apr 07 19:36:14 2002 +0000
@@ -718,7 +718,8 @@
     ;; Actually using hooks within Emacs is bad for future maintenance. --rms.
     ;;
     ;; In this case, I completely agree. --ben
-    (init-menubar-at-startup)
+    (if (featurep 'menubar)
+	(init-menubar-at-startup))
     ;; perhaps this should go earlier in the proecess?
     (if (featurep 'mule)
 	(declare-fboundp (init-mule-at-startup)))