Mercurial > hg > xemacs-beta
diff lisp/dumped-lisp.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 | 97eb4942aec8 |
| children | 0d43872986b6 |
line wrap: on
line diff
--- a/lisp/dumped-lisp.el Sun Jun 06 13:24:31 2010 +0100 +++ b/lisp/dumped-lisp.el Mon Jun 07 18:42:10 2010 +0100 @@ -148,10 +148,10 @@ ;; should just be able to assume that, if (featurep 'menubar), ;; the menubar should work and if items are added, they can be ;; seen clearly and usefully. - (when (featurep '(and (not infodock) menubar)) "menubar-items") - (when (featurep '(and gutter)) "gutter-items") - (when (featurep '(and (not infodock) toolbar)) "toolbar-items") - (when (featurep '(and (not infodock) dialog)) "dialog-items") + (when (featurep 'menubar) "menubar-items") + (when (featurep 'gutter) "gutter-items") + (when (featurep 'toolbar) "toolbar-items") + (when (featurep 'dialog) "dialog-items") ;;;;;;;;;;;;;;;;;; Coding-system support "coding" @@ -234,12 +234,6 @@ ;;; mule-load.el ends here -;; preload InfoDock stuff. should almost certainly not be here if -;; id-menus is not here. infodock needs to figure out a clever way to -;; advise this stuff or we need to export a clean way for infodock or -;; others to control this programmatically. - (when (featurep '(and infodock (or x mswindows gtk) menubar)) - "id-menus") ;; preload the X code. (when (featurep '(and x scrollbar)) "x-scrollbar") (when (featurep 'x)