Merged from emacs@sv.gnu.org

Patches applied:

 * emacs@sv.gnu.org/emacs--devo--0--patch-285
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-286
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-287
   Merge from gnus--rel--5.10

 * emacs@sv.gnu.org/emacs--devo--0--patch-288
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-102
   Update from CVS

git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-558

2 files changed, 6 insertions, 2 deletions

diff --git a/mac/ChangeLog b/mac/ChangeLog
index 80e30045dda..a17f456ae6f 100644
--- a/mac/ChangeLog
+++ b/mac/ChangeLog
@@ -1,3 +1,7 @@
+2006-05-19  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+        * makefile.MPW (SOME_MACHINE_LISP): Add fringe.elc.
+
 2006-04-12  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
 
         * inc/config.h (pid_t): Define to int.
diff --git a/mac/makefile.MPW b/mac/makefile.MPW
index 6dc10cbbc81..ab62673a559 100644
--- a/mac/makefile.MPW
+++ b/mac/makefile.MPW
@@ -1115,8 +1115,8 @@ SOME_MACHINE_LISP = {Lisp}mouse.elc ¶
   {Lisp}w32-fns.elc {Lisp}dos-w32.elc ¶
   {Lisp}disp-table.elc {Lisp}dos-vars.elc ¶
   {Lisp}tooltip.elc {Lisp}image.elc ¶
-  {Lisp}dnd.elc {Lisp}mwheel.elc ¶
-  {Lisp}tool-bar.elc ¶
+  {Lisp}fringe.elc {Lisp}dnd.elc ¶
+  {Lisp}mwheel.elc {Lisp}tool-bar.elc ¶
   {Lisp}x-dnd.elc ¶
   {Lisp}international:ccl.elc ¶
   {Lisp}international:codepage.elc ¶