aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAndreas Schwab2010-01-16 10:40:57 +0100
committerAndreas Schwab2010-01-16 10:40:57 +0100
commite118d2be3b70097e71c0be4d0fc1f88b0fb39e88 (patch)
tree4e7f7bbb5a1c8f3c83b87736b0dd6265f2f8fedc /src
parent523ae620e8b915eb52101fd5808e1cff67cd559a (diff)
downloademacs-e118d2be3b70097e71c0be4d0fc1f88b0fb39e88.tar.gz
emacs-e118d2be3b70097e71c0be4d0fc1f88b0fb39e88.zip
Update $(lisp) and $(shortlisp) to match changes in loadup.el
* Makefile.in (lisp, shortlisp): Update.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog4
-rw-r--r--src/Makefile.in16
2 files changed, 12 insertions, 8 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 9cbab2b4d98..94a1f9604f5 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
12010-01-16 Andreas Schwab <schwab@linux-m68k.org>
2
3 * Makefile.in (lisp, shortlisp): Update.
4
12010-01-16 Stefan Monnier <monnier@iro.umontreal.ca> 52010-01-16 Stefan Monnier <monnier@iro.umontreal.ca>
2 6
3 * xterm.c (x_term_init): Instead of inhibiting GC while running Lisp 7 * xterm.c (x_term_init): Instead of inhibiting GC while running Lisp
diff --git a/src/Makefile.in b/src/Makefile.in
index 1fd3a3ffe85..11facec6023 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -736,13 +736,13 @@ lisp= \
736 ${lispsource}emacs-lisp/map-ynp.elc \ 736 ${lispsource}emacs-lisp/map-ynp.elc \
737 ${lispsource}menu-bar.elc \ 737 ${lispsource}menu-bar.elc \
738 ${lispsource}international/mule.elc \ 738 ${lispsource}international/mule.elc \
739 ${lispsource}international/mule-conf.el \ 739 ${lispsource}international/mule-conf.elc \
740 ${lispsource}international/mule-cmds.elc \ 740 ${lispsource}international/mule-cmds.elc \
741 ${lispsource}international/characters.elc \ 741 ${lispsource}international/characters.elc \
742 ${lispsource}international/charprop.el \ 742 ${lispsource}international/charprop.el \
743 ${lispsource}case-table.elc \ 743 ${lispsource}case-table.elc \
744 ${lispsource}language/chinese.el \ 744 ${lispsource}language/chinese.elc \
745 ${lispsource}language/cyrillic.el \ 745 ${lispsource}language/cyrillic.elc \
746 ${lispsource}language/indian.elc \ 746 ${lispsource}language/indian.elc \
747 ${lispsource}language/sinhala.el \ 747 ${lispsource}language/sinhala.el \
748 ${lispsource}language/english.el \ 748 ${lispsource}language/english.el \
@@ -760,7 +760,7 @@ lisp= \
760 ${lispsource}language/tai-viet.el \ 760 ${lispsource}language/tai-viet.el \
761 ${lispsource}language/thai.el \ 761 ${lispsource}language/thai.el \
762 ${lispsource}language/tibetan.elc \ 762 ${lispsource}language/tibetan.elc \
763 ${lispsource}language/vietnamese.el \ 763 ${lispsource}language/vietnamese.elc \
764 ${lispsource}language/misc-lang.el \ 764 ${lispsource}language/misc-lang.el \
765 ${lispsource}language/utf-8-lang.el \ 765 ${lispsource}language/utf-8-lang.el \
766 ${lispsource}language/georgian.el \ 766 ${lispsource}language/georgian.el \
@@ -829,12 +829,12 @@ shortlisp= \
829 ../lisp/emacs-lisp/map-ynp.elc \ 829 ../lisp/emacs-lisp/map-ynp.elc \
830 ../lisp/env.elc \ 830 ../lisp/env.elc \
831 ../lisp/international/mule.elc \ 831 ../lisp/international/mule.elc \
832 ../lisp/international/mule-conf.el \ 832 ../lisp/international/mule-conf.elc \
833 ../lisp/international/mule-cmds.elc \ 833 ../lisp/international/mule-cmds.elc \
834 ../lisp/international/characters.elc \ 834 ../lisp/international/characters.elc \
835 ../lisp/case-table.elc \ 835 ../lisp/case-table.elc \
836 ../lisp/language/chinese.el \ 836 ../lisp/language/chinese.elc \
837 ../lisp/language/cyrillic.el \ 837 ../lisp/language/cyrillic.elc \
838 ../lisp/language/indian.elc \ 838 ../lisp/language/indian.elc \
839 ../lisp/language/sinhala.el \ 839 ../lisp/language/sinhala.el \
840 ../lisp/language/english.el \ 840 ../lisp/language/english.el \
@@ -852,7 +852,7 @@ shortlisp= \
852 ../lisp/language/tai-viet.el \ 852 ../lisp/language/tai-viet.el \
853 ../lisp/language/thai.el \ 853 ../lisp/language/thai.el \
854 ../lisp/language/tibetan.elc \ 854 ../lisp/language/tibetan.elc \
855 ../lisp/language/vietnamese.el \ 855 ../lisp/language/vietnamese.elc \
856 ../lisp/language/misc-lang.el \ 856 ../lisp/language/misc-lang.el \
857 ../lisp/language/utf-8-lang.el \ 857 ../lisp/language/utf-8-lang.el \
858 ../lisp/language/georgian.el \ 858 ../lisp/language/georgian.el \