aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEli Zaretskii2000-05-23 10:47:20 +0000
committerEli Zaretskii2000-05-23 10:47:20 +0000
commit9aeb39fad8d034feffa085b9ae9135afdead5ff2 (patch)
treeefd9fd86fa17d1bf270de33dc273f4ffafb2e18a
parentce75fd23484c39eaf350af874a3ddd82661ed3a9 (diff)
downloademacs-9aeb39fad8d034feffa085b9ae9135afdead5ff2.tar.gz
emacs-9aeb39fad8d034feffa085b9ae9135afdead5ff2.zip
(SOME_MACHINE_LISP): Add disp-table.elc,
dos-vars.elc, ccl.elc, and codepage.elc, all loaded by the ms-dos version. (MSDOS_SUPPORT): Add dos-vars.elc, ccl.elc, and codepage.elc.
-rw-r--r--src/ChangeLog7
-rw-r--r--src/Makefile.in9
2 files changed, 14 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index a66a6291900..fceb7ab65ae 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,10 @@
12000-05-23 Eli Zaretskii <eliz@is.elta.co.il>
2
3 * Makefile.in (SOME_MACHINE_LISP): Add disp-table.elc,
4 dos-vars.elc, ccl.elc, and codepage.elc, all loaded by the MS-DOS
5 version.
6 (MSDOS_SUPPORT): Add dos-vars.elc, ccl.elc, and codepage.elc.
7
12000-05-23 Kenichi Handa <handa@etl.go.jp> 82000-05-23 Kenichi Handa <handa@etl.go.jp>
2 9
3 * syntax.c (skip_chars): Use FETCH_STRING_CHAR_ADVANCE 10 * syntax.c (skip_chars): Use FETCH_STRING_CHAR_ADVANCE
diff --git a/src/Makefile.in b/src/Makefile.in
index b925ee7f870..75db79b23de 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -620,7 +620,9 @@ otherobj= $(termcapobj) lastfile.o $(mallocobj) $(allocaobj) $(widgetobj) $(LIBO
620 620
621#ifdef MSDOS 621#ifdef MSDOS
622#define MSDOS_SUPPORT ${lispsource}ls-lisp.elc ${lispsource}disp-table.elc \ 622#define MSDOS_SUPPORT ${lispsource}ls-lisp.elc ${lispsource}disp-table.elc \
623 ${lispsource}dos-fns.elc ${lispsource}dos-w32.elc 623 ${lispsource}dos-fns.elc ${lispsource}dos-w32.elc ${lispsource}dos-vars.elc \
624 ${lispsource}international/ccl.elc ${lispsource}international/codepage.elc
625
624#else 626#else
625#define MSDOS_SUPPORT 627#define MSDOS_SUPPORT
626#endif 628#endif
@@ -787,7 +789,10 @@ SOME_MACHINE_LISP = ${dotdot}/lisp/menu-bar.elc ${dotdot}/lisp/mouse.elc \
787 ${dotdot}/lisp/select.elc ${dotdot}/lisp/scroll-bar.elc \ 789 ${dotdot}/lisp/select.elc ${dotdot}/lisp/scroll-bar.elc \
788 ${dotdot}/lisp/vmsproc.elc ${dotdot}/lisp/vms-patch.elc \ 790 ${dotdot}/lisp/vmsproc.elc ${dotdot}/lisp/vms-patch.elc \
789 ${dotdot}/lisp/ls-lisp.elc ${dotdot}/lisp/dos-fns.elc \ 791 ${dotdot}/lisp/ls-lisp.elc ${dotdot}/lisp/dos-fns.elc \
790 ${dotdot}/lisp/w32-fns.elc ${dotdot}/lisp/dos-w32.elc 792 ${dotdot}/lisp/w32-fns.elc ${dotdot}/lisp/dos-w32.elc \
793 ${dotdot}/lisp/disp-table.elc ${dotdot}/lisp/dos-vars.elc \
794 ${dotdot}/lisp/international/ccl.elc \
795 ${dotdot}/lisp/international/codepage.elc
791 796
792/* Construct full set of libraries to be linked. 797/* Construct full set of libraries to be linked.
793 Note that SunOS needs -lm to come before -lc; otherwise, you get 798 Note that SunOS needs -lm to come before -lc; otherwise, you get