Mercurial > hg > xemacs-beta
comparison 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 |
comparison
equal
deleted
inserted
replaced
| 5227:fbd1485af104 | 5228:5efbd1253905 |
|---|---|
| 146 ;; but IMHO your configure script should turn off the menubar, | 146 ;; but IMHO your configure script should turn off the menubar, |
| 147 ;; toolbar, etc. features when there is no window system. We | 147 ;; toolbar, etc. features when there is no window system. We |
| 148 ;; should just be able to assume that, if (featurep 'menubar), | 148 ;; should just be able to assume that, if (featurep 'menubar), |
| 149 ;; the menubar should work and if items are added, they can be | 149 ;; the menubar should work and if items are added, they can be |
| 150 ;; seen clearly and usefully. | 150 ;; seen clearly and usefully. |
| 151 (when (featurep '(and (not infodock) menubar)) "menubar-items") | 151 (when (featurep 'menubar) "menubar-items") |
| 152 (when (featurep '(and gutter)) "gutter-items") | 152 (when (featurep 'gutter) "gutter-items") |
| 153 (when (featurep '(and (not infodock) toolbar)) "toolbar-items") | 153 (when (featurep 'toolbar) "toolbar-items") |
| 154 (when (featurep '(and (not infodock) dialog)) "dialog-items") | 154 (when (featurep 'dialog) "dialog-items") |
| 155 | 155 |
| 156 ;;;;;;;;;;;;;;;;;; Coding-system support | 156 ;;;;;;;;;;;;;;;;;; Coding-system support |
| 157 "coding" | 157 "coding" |
| 158 "code-files" | 158 "code-files" |
| 159 ;; Handle process with encoding/decoding coding-system. | 159 ;; Handle process with encoding/decoding coding-system. |
| 232 (when (featurep 'mule) | 232 (when (featurep 'mule) |
| 233 "mule/general-late") | 233 "mule/general-late") |
| 234 | 234 |
| 235 ;;; mule-load.el ends here | 235 ;;; mule-load.el ends here |
| 236 | 236 |
| 237 ;; preload InfoDock stuff. should almost certainly not be here if | |
| 238 ;; id-menus is not here. infodock needs to figure out a clever way to | |
| 239 ;; advise this stuff or we need to export a clean way for infodock or | |
| 240 ;; others to control this programmatically. | |
| 241 (when (featurep '(and infodock (or x mswindows gtk) menubar)) | |
| 242 "id-menus") | |
| 243 ;; preload the X code. | 237 ;; preload the X code. |
| 244 (when (featurep '(and x scrollbar)) "x-scrollbar") | 238 (when (featurep '(and x scrollbar)) "x-scrollbar") |
| 245 (when (featurep 'x) | 239 (when (featurep 'x) |
| 246 '("x-mouse" | 240 '("x-mouse" |
| 247 "x-select" | 241 "x-select" |