diff options
| author | Eli Zaretskii | 2012-11-03 15:56:02 +0200 |
|---|---|---|
| committer | Eli Zaretskii | 2012-11-03 15:56:02 +0200 |
| commit | 1d4341f98813e8f2f4179e1d0a414b2f16c880eb (patch) | |
| tree | 15a9749739259762f97e8b271678c4d997bece51 /src | |
| parent | b3cf17f69548c28d21942cc92a7b65e258857f85 (diff) | |
| download | emacs-1d4341f98813e8f2f4179e1d0a414b2f16c880eb.tar.gz emacs-1d4341f98813e8f2f4179e1d0a414b2f16c880eb.zip | |
Load term/internal from loadup.el.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 3 | ||||
| -rw-r--r-- | src/lisp.mk | 6 |
2 files changed, 6 insertions, 3 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 72e3d8ea741..43a2c91e1f4 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,5 +1,8 @@ | |||
| 1 | 2012-11-03 Eli Zaretskii <eliz@gnu.org> | 1 | 2012-11-03 Eli Zaretskii <eliz@gnu.org> |
| 2 | 2 | ||
| 3 | * lisp.mk: Adjust comments to the fact that term/internal is now | ||
| 4 | loaded from loadup.el. | ||
| 5 | |||
| 3 | * msdos.c (msdos_abort): Rename from emacs_abort, and make static. | 6 | * msdos.c (msdos_abort): Rename from emacs_abort, and make static. |
| 4 | (msdos_fatal_signal): New function. | 7 | (msdos_fatal_signal): New function. |
| 5 | (XMenuActivate): Adjust the call to kbd_buffer_events_waiting to | 8 | (XMenuActivate): Adjust the call to kbd_buffer_events_waiting to |
diff --git a/src/lisp.mk b/src/lisp.mk index 1f459d4d5f1..8c2710110e3 100644 --- a/src/lisp.mk +++ b/src/lisp.mk | |||
| @@ -34,9 +34,9 @@ | |||
| 34 | ## that does not have an explicit .el extension, but beware of any | 34 | ## that does not have an explicit .el extension, but beware of any |
| 35 | ## no-byte-compile ones. | 35 | ## no-byte-compile ones. |
| 36 | 36 | ||
| 37 | ## Confusingly, term/internal is not in loadup, but is unconditionally | 37 | ## Confusingly, international/cp51932 and international/eucjp-ms are |
| 38 | ## loaded by pc-win, which is. Ditto for international/cp51932 and | 38 | ## unconditionally loaded from language/japanese, instead of being |
| 39 | ## international/eucjp-ms, loaded from language/japanese. | 39 | ## loaded directly from loadup.el; FIXME. |
| 40 | 40 | ||
| 41 | ## Note that this list should not include lisp files which might not | 41 | ## Note that this list should not include lisp files which might not |
| 42 | ## be present, like site-load.el and site-init.el; this makefile | 42 | ## be present, like site-load.el and site-init.el; this makefile |