Remove all support for InfoDock. src/ChangeLog addition: 2010-06-02 Aidan Kehoe <kehoea@parhasard.net> * lread.c (vars_of_lread): * emacs.c: (shut_down_emacs, vars_of_emacs, complex_vars_of_emacs): * device-x.c (get_device_from_display) (have_xemacs_resources_in_xrdb): * device-gtk.c (Fgtk_init): * config.h.in: Remove all checks for InfoDock. lisp/ChangeLog addition: 2010-06-02 Aidan Kehoe <kehoea@parhasard.net> * version.el: (emacs-version): * startup.el (command-line): * simple.el (display-warning, emacs-name): * packages.el (packages-package-hierarchy-directory-names): * loadup.el (Dumping): * dumped-lisp.el (preloaded-file-list): Remove all InfoDock-specific code.

--- a/lisp/startup.el	Sun Jun 06 13:24:31 2010 +0100
+++ b/lisp/startup.el	Mon Jun 07 18:42:10 2010 +0100
@@ -722,9 +722,7 @@
 	(declare-fboundp (init-mule-at-startup)))
 
       (if (featurep 'toolbar)
-	  (if (featurep 'infodock)
-	      (require 'id-x-toolbar)
-	    (init-toolbar)))
+          (init-toolbar))
 
       ;; Create the initial device (which may be the already-created stdio
       ;; device, if we're noninteractive).