Load term/internal from loadup.el.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ab73a61d9e64334a1ec79e5755f9096dbe028670..c5d57541da49c85b84371f53d08f2bffc307f89c 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+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

diff --git a/lisp/loadup.el b/lisp/loadup.el
index e5f2cb014d3806d784d20db3f2b580eda5193768..f017295c33bb37e305114c2ac99fe25f07b5e406 100644 (file)
--- a/lisp/loadup.el
+++ b/lisp/loadup.el
@@ -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

diff --git a/lisp/term/pc-win.el b/lisp/term/pc-win.el
index b460e3b8a142858fff68edc304c36b66361cdbc5..9fd3bf14fe1f9c28727db119309ddf727f42b33b 100644 (file)
--- a/lisp/term/pc-win.el
+++ b/lisp/term/pc-win.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")

diff --git a/src/ChangeLog b/src/ChangeLog
index 72e3d8ea7415a9cadc6ca389b199709d73e331b4..43a2c91e1f4bfbb3a8f2a9dfd0d0b1102199a0b6 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,8 @@
 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

diff --git a/src/lisp.mk b/src/lisp.mk
index 1f459d4d5f19eba83be1d488b264c846451e3f42..8c2710110e36a08af2ef3a7f0dff797d0f4941cc 100644 (file)
--- a/src/lisp.mk
+++ b/src/lisp.mk
@@ -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