diff options
author | Karoly Lorentey <lorentey@elte.hu> | 2005-11-18 13:13:34 +0000 |
---|---|---|
committer | Karoly Lorentey <lorentey@elte.hu> | 2005-11-18 13:13:34 +0000 |
commit | 73af68afbc925cc6d5dfc2340538ae24905bbca4 (patch) | |
tree | b4a55abbdb3776755f486800f90e82c4b1211ff2 /mac | |
parent | 202adc755c02c2124d6469767126a24072c9397a (diff) | |
parent | c1fc181b93bebd80a0471037859745d555d41e41 (diff) | |
download | emacs-73af68afbc925cc6d5dfc2340538ae24905bbca4.tar.gz |
Merged from miles@gnu.org--gnu-2005 (patch 152-156, 642-654)
Patches applied:
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-642
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-643
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-644
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-645
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-646
Merge from gnus--rel--5.10
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-647
lisp/gnus/ChangeLog: Remove duplicate entry
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-648
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-649
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-650
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-651
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-652
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-653
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-654
Update from CVS
* miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-152
Update from CVS: lisp/mml.el (mml-preview): Doc fix.
* miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-153
Update from CVS
* miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-154
Update from CVS
* miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-155
Update from CVS
* miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-156
Update from CVS
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-440
Diffstat (limited to 'mac')
-rw-r--r-- | mac/ChangeLog | 4 | ||||
-rw-r--r-- | mac/makefile.MPW | 3 |
2 files changed, 7 insertions, 0 deletions
diff --git a/mac/ChangeLog b/mac/ChangeLog index 15b5855db92..e61cb12a946 100644 --- a/mac/ChangeLog +++ b/mac/ChangeLog @@ -1,3 +1,7 @@ +2005-11-09 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> + + * makefile.MPW (shortlisp): Sync with src/Makefile.in. + 2005-10-24 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> * INSTALL: Replace `Mac OS 8/9' with `Mac OS Classic'. Add diff --git a/mac/makefile.MPW b/mac/makefile.MPW index 9d8eda541cf..60edb1f8732 100644 --- a/mac/makefile.MPW +++ b/mac/makefile.MPW @@ -1077,6 +1077,9 @@ shortlisp = ¶ {Lisp}subr.elc ¶ {Lisp}term:tty-colors.elc ¶ {Lisp}font-core.elc ¶ + {Lisp}emacs-lisp:syntax.elc ¶ + {Lisp}font-lock.elc ¶ + {Lisp}jit-lock.elc ¶ {Lisp}textmodes:fill.elc ¶ {Lisp}textmodes:page.elc ¶ {Lisp}textmodes:paragraphs.elc ¶ |