Merged from emacs@sv.gnu.org

Patches applied:

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

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

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

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

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

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

 * emacs@sv.gnu.org/emacs--devo--0--patch-666
   Fix read-only prompt problem in isearch

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

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

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

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

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

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

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

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

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

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

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

1 files changed, 9 insertions, 6 deletions

diff --git a/mac/makefile.MPW b/mac/makefile.MPW
index 741a8e124d7..801e7b36fe6 100644
--- a/mac/makefile.MPW
+++ b/mac/makefile.MPW
@@ -374,7 +374,7 @@ buildobj.lst Ä
         "{Src}coding.h" ¶
                 "{Src}ccl.h" ¶
         "{Src}regex.h" ¶
-        "{Src}blockinput.h"
+        {BLOCKINPUT_H_GROUP}
 
 {Src}dispnew.c.x Ä ¶
         {CONFIG_H_GROUP} ¶
@@ -427,7 +427,7 @@ buildobj.lst Ä
         {WINDOW_H_GROUP} ¶
         "{Src}systime.h" ¶
                 "{Includes}sys:time.h" ¶
-        "{Src}blockinput.h"
+        {BLOCKINPUT_H_GROUP}
 
 {Src}emacs.c.x Ä ¶
         {CONFIG_H_GROUP} ¶
@@ -471,7 +471,7 @@ buildobj.lst Ä
         "{Src}systime.h" ¶
                 "{Includes}sys:time.h" ¶
         "{Src}commands.h" ¶
-        "{Src}blockinput.h"
+        {BLOCKINPUT_H_GROUP}
 
 {Src}filemode.c.x Ä ¶
         {CONFIG_H_GROUP} ¶
@@ -640,7 +640,8 @@ buildobj.lst Ä
         "{Includes}epaths.h" ¶
         "{Src}commands.h" ¶
         "{Src}keyboard.h" ¶
-        "{Src}termhooks.h"
+        "{Src}termhooks.h" ¶
+        {BLOCKINPUT_H_GROUP}
 
 {Src}macros.c.x Ä ¶
         {CONFIG_H_GROUP} ¶
@@ -684,7 +685,8 @@ buildobj.lst Ä
         {DISPEXTERN_H_GROUP} ¶
         "{Src}termchar.h" ¶
         "{Src}keyboard.h" ¶
-        {INTERVALS_H_GROUP}
+        {INTERVALS_H_GROUP} ¶
+        {BLOCKINPUT_H_GROUP}
 
 {Src}process.c.x Ä ¶
         {CONFIG_H_GROUP} ¶
@@ -791,7 +793,8 @@ buildobj.lst Ä
         "{Src}cm.h" ¶
         "{Src}macterm.h" ¶
                 "{Src}macgui.h" ¶
-                "{Src}frame.h"
+                "{Src}frame.h" ¶
+        {BLOCKINPUT_H_GROUP}
 
 {Src}termcap.c.x Ä ¶
         {CONFIG_H_GROUP} ¶