Commit 1d4341f9 authored by Eli Zaretskii's avatar Eli Zaretskii
Browse files

Load term/internal from loadup.el.

parent b3cf17f6
2012-11-03 Eli Zaretskii <eliz@gnu.org>
* term/pc-win.el: Don't load term/internal from here.
* loadup.el: Load term/internal from here.
2012-11-01 Stephen Berman <stephen.berman@gmx.net>
 
* play/gomoku.el (gomoku-display-statistics): Update mode line
......
......@@ -257,6 +257,7 @@
(load "dos-vars")
;; Don't load term/common-win: it isn't appropriate for the `pc'
;; ``window system'', which generally behaves like a terminal.
(load "term/internal")
(load "term/pc-win")
(load "ls-lisp")
(load "disp-table"))) ; needed to setup ibm-pc char set, see internal.el
......
......@@ -40,8 +40,6 @@
(error "%s: Loading pc-win.el but not compiled for MS-DOS"
(invocation-name)))
(load "term/internal" nil t)
(declare-function msdos-remember-default-colors "msdos.c")
(declare-function w16-set-clipboard-data "w16select.c")
(declare-function w16-get-clipboard-data "w16select.c")
......
2012-11-03 Eli Zaretskii <eliz@gnu.org>
 
* lisp.mk: Adjust comments to the fact that term/internal is now
loaded from loadup.el.
* msdos.c (msdos_abort): Rename from emacs_abort, and make static.
(msdos_fatal_signal): New function.
(XMenuActivate): Adjust the call to kbd_buffer_events_waiting to
......
......@@ -34,9 +34,9 @@
## that does not have an explicit .el extension, but beware of any
## no-byte-compile ones.
## Confusingly, term/internal is not in loadup, but is unconditionally
## loaded by pc-win, which is. Ditto for international/cp51932 and
## international/eucjp-ms, loaded from language/japanese.
## Confusingly, international/cp51932 and international/eucjp-ms are
## unconditionally loaded from language/japanese, instead of being
## loaded directly from loadup.el; FIXME.
## Note that this list should not include lisp files which might not
## be present, like site-load.el and site-init.el; this makefile
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment