Merged from emacs@sv.gnu.org

Patches applied:

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

2 files changed, 11 insertions, 3 deletions

diff --git a/mac/ChangeLog b/mac/ChangeLog
index 20c9c255c58..e99b092e8be 100644
--- a/mac/ChangeLog
+++ b/mac/ChangeLog
@@ -1,3 +1,8 @@
+2006-07-20  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+        * makefile.MPW (dired.c.x, editfns.c.x, fileio.c.x): Depend on
+        blockinput.h.
+
 2006-07-12  Kim F. Storm  <storm@cua.dk>
 
         * INSTALL: More cleanup related to last change.
diff --git a/mac/makefile.MPW b/mac/makefile.MPW
index ab62673a559..7f4c043604e 100644
--- a/mac/makefile.MPW
+++ b/mac/makefile.MPW
@@ -373,7 +373,8 @@ buildobj.lst Ä
         "{Src}charset.h" ¶
         "{Src}coding.h" ¶
                 "{Src}ccl.h" ¶
-        "{Src}regex.h"
+        "{Src}regex.h" ¶
+        "{Src}blockinput.h"
 
 {Src}dispnew.c.x Ä ¶
         {CONFIG_H_GROUP} ¶
@@ -425,7 +426,8 @@ buildobj.lst Ä
         "{Src}ccl.h" ¶
         {WINDOW_H_GROUP} ¶
         "{Src}systime.h" ¶
-                "{Includes}sys:time.h"
+                "{Includes}sys:time.h" ¶
+        "{Src}blockinput.h"
 
 {Src}emacs.c.x Ä ¶
         {CONFIG_H_GROUP} ¶
@@ -468,7 +470,8 @@ buildobj.lst Ä
         {WINDOW_H_GROUP} ¶
         "{Src}systime.h" ¶
                 "{Includes}sys:time.h" ¶
-        "{Src}commands.h"
+        "{Src}commands.h" ¶
+        "{Src}blockinput.h"
 
 {Src}filemode.c.x Ä ¶
         {CONFIG_H_GROUP} ¶