comparison lisp/startup.el @ 5228:5efbd1253905

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.
author Aidan Kehoe <kehoea@parhasard.net>
date Mon, 07 Jun 2010 18:42:10 +0100
parents fd36a980d701
children 3889ef128488 308d34e9f07d
comparison
equal deleted inserted replaced
5227:fbd1485af104 5228:5efbd1253905
720 ;; initialisation in case of keysyms of the form UABCD. 720 ;; initialisation in case of keysyms of the form UABCD.
721 (when (featurep 'mule) 721 (when (featurep 'mule)
722 (declare-fboundp (init-mule-at-startup))) 722 (declare-fboundp (init-mule-at-startup)))
723 723
724 (if (featurep 'toolbar) 724 (if (featurep 'toolbar)
725 (if (featurep 'infodock) 725 (init-toolbar))
726 (require 'id-x-toolbar)
727 (init-toolbar)))
728 726
729 ;; Create the initial device (which may be the already-created stdio 727 ;; Create the initial device (which may be the already-created stdio
730 ;; device, if we're noninteractive). 728 ;; device, if we're noninteractive).
731 (make-device initial-device-type nil nil) 729 (make-device initial-device-type nil nil)
732 730