Mercurial > hg > xemacs-beta
diff lisp/simple.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 | db2db229ee82 |
| children | 57a64ab2ae45 308d34e9f07d |
line wrap: on
line diff
--- a/lisp/simple.el Sun Jun 06 13:24:31 2010 +0100 +++ b/lisp/simple.el Mon Jun 07 18:42:10 2010 +0100 @@ -4681,8 +4681,7 @@ (or level (setq level 'warning)) (or (listp class) (setq class (list class))) (check-argument-type 'warning-level-p level) - (if (and (not (featurep 'infodock)) - (not init-file-loaded)) + (if (not init-file-loaded) (push (list class message level) before-init-deferred-warnings) (catch 'ignored (let ((display-p t) @@ -4772,8 +4771,7 @@ (defun emacs-name () "Return the printable name of this instance of Emacs." - (cond ((featurep 'infodock) "InfoDock") - ((featurep 'xemacs) "XEmacs") + (cond ((featurep 'xemacs) "XEmacs") (t "Emacs"))) (defun debug-print-1 (&rest args)