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/loadup.el	Sun Jun 06 13:24:31 2010 +0100
+++ b/lisp/loadup.el	Mon Jun 07 18:42:10 2010 +0100
@@ -264,12 +264,7 @@
 	load-always-display-messages nil
 	debug-on-error nil)
   (dump-emacs
-   (cond
-    ((featurep 'infodock) "infodock")
-    ;; #### BILL!!!
-    ;; If we want to dump under a name other than `xemacs', do that here!
-    ;; ((featurep 'gtk) "xemacs-gtk")
-    (t "xemacs"))
+   "xemacs"
    "temacs")
   (kill-emacs))