--- a/lisp/dumped-lisp.el	Mon Aug 13 10:29:43 2007 +0200
+++ b/lisp/dumped-lisp.el	Mon Aug 13 10:30:37 2007 +0200
@@ -140,12 +140,12 @@
 
 	;; Specialized language support
 	#+(and mule CANNA) "canna-leim"
-;; Egg/Its is now a package with its own dumped-lisp.el file
+;; Egg/Its is now a package
 ;	#+(and mule wnn) "egg-leim"
 ;	#+(and mule wnn) "egg-kwnn-leim"
 ;	#+(and mule wnn) "egg-cwnn-leim"
 ;	#+mule "egg-sj3-leim"
-;; SKK is now a package with its own dumped-lisp.el file
+;; SKK is now a package
 ;	#+mule "skk-leim"
 
 ;; Set up the XEmacs environment for Mule.
@@ -169,7 +169,7 @@
 	#+(and x scrollbar) "x-scrollbar"
 	#+x "x-misc"
 	#+x "x-init"
-	#+(and (not infodock) x toolbar) "x-toolbar"
+	#+(and (not infodock) window-system toolbar) "x-toolbar"
 	#+x "x-win-xfree86"
 	#+x "x-win-sun"
 ;; preload the mswindows code.