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/version.el	Sun Jun 06 13:24:31 2010 +0100
+++ b/lisp/version.el	Mon Jun 07 18:42:10 2010 +0100
@@ -56,9 +56,6 @@
 	  " XEmacs Lucid")
   "Version numbers of this version of XEmacs.")
 
-(if (featurep 'infodock)
-    (require 'id-vers))
-
 ;; Moved to C code as of XEmacs 20.3
 ;(defconst emacs-major-version
 ;  (progn (or (string-match "^[0-9]+" emacs-version)
@@ -95,9 +92,7 @@
 	   (format
 	    "XEmacs %s %s(%s%s) of %s %s on %s"
 	    (substring emacs-version 0 (string-match " XEmacs" emacs-version))
-	    (if (not (featurep 'infodock))
-		"[Lucid] "
-	      "")
+            "[Lucid] "
 	    system-configuration
 	    (cond ((or (and (fboundp 'featurep)
 			    (featurep 'mule))