5 files changed, 16 insertions, 23 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 6351e0168f7..a47586e08c3 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,12 @@
+2008-07-16  Adrian Robert <Adrian.B.Robert@gmail.com>
+
+        * syntax.c: Remove stdio.h include accidentally introduced in
+        Emacs.app commit.
+        * Makefile.in: Change GNUSTEP to NS_IMPL_GNUSTEP, COCOA to
+        NS_IMPL_COCOA.
+        * keyboard.c (handle_async_input, input_available_signal): Remove
+        BSD4_1 conditional code, introduced accidentally in Emacs.app commit.
+
 2008-07-16  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * nsterm.m (lisp_to_mod): Use parse_solitary_modifier instead.
diff --git a/src/Makefile.in b/src/Makefile.in
index 8f2c2f8805f..a715b83be28 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -113,7 +113,7 @@ SHELL=/bin/sh
 #endif
 
 /* Under GNUstep, putting libc on the link line causes problems. */
-#ifdef GNUSTEP
+#ifdef NS_IMPL_GNUSTEP
 #define LIB_STANDARD
 #endif
 
@@ -234,7 +234,7 @@ STARTFILES = START_FILES
 #endif /* not ORDINARY_LINK */
 
 
-#ifdef GNUSTEP
+#ifdef NS_IMPL_GNUSTEP
 /* Pull in stuff from GNUstep-make. */
 FOUNDATION_LIB=gnu
 GUI_LIB=gnu
@@ -535,13 +535,13 @@ emacsappsrc = ${srcdir}/../mac/Emacs.app/
 NS_OBJ= nsterm.o nsfns.o nsmenu.o nsselect.o nsimage.o nsfont.o \
         fontset.o fringe.o image.o
 emacsapp = $(PWD)/../nextstep/build/Emacs.app/
-#ifdef GNUSTEP
+#ifdef NS_IMPL_GNUSTEP
 emacsappsrc = ${srcdir}/../nextstep/GNUstep/Emacs.base
 emacsbindir = $(emacsapp)
 #else
 emacsappsrc = ${srcdir}/../nextstep/Cocoa/Emacs.base
 emacsbindir = $(emacsapp)/Contents/MacOS/
-#endif  /* GNUSTEP */
+#endif  /* NS_IMPL_GNUSTEP */
 #endif  /* HAVE_NS */
 
 #ifdef HAVE_WINDOW_SYSTEM
@@ -969,7 +969,7 @@ ${libsrc}make-docfile${EXEEXT}:
 
 temacs${EXEEXT}: $(LOCALCPP) $(STARTFILES) stamp-oldxmenu ${obj} ${otherobj} OBJECTS_MACHINE prefix-args${EXEEXT}
         echo "${obj} ${otherobj} " OBJECTS_MACHINE > buildobj.lst
-#ifdef GNUSTEP
+#ifdef NS_IMPL_GNUSTEP
         $(CC) -rdynamic YMF_PASS_LDFLAGS (${TEMACS_LDFLAGS}) -o temacs ${obj} ${otherobj} OBJECTS_MACHINE ${LIBES}
 #else
         $(LD) YMF_PASS_LDFLAGS (${STARTFLAGS} ${TEMACS_LDFLAGS}) $(LDFLAGS) \
@@ -1355,7 +1355,7 @@ mostlyclean:
         rm -f buildobj.lst
 clean: mostlyclean
         rm -f emacs-*.*.*${EXEEXT} emacs${EXEEXT}
-#ifdef GNUSTEP
+#ifdef NS_IMPL_GNUSTEP
         rm -f *.d
 #endif
 /* bootstrap-clean is used to clean up just before a bootstrap.
diff --git a/src/frame.c b/src/frame.c
index d297501343b..88cabc2ac80 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -206,7 +206,7 @@ DEFUN ("framep", Fframep, Sframep, 1, 1, 0,
 Value is t for a termcap frame (a character-only terminal),
 `x' for an Emacs frame that is really an X window,
 `w32' for an Emacs frame that is a window on MS-Windows display,
-`mac' for an Emacs frame on a Macintosh 8/9 X-Carbon display,
+`mac' for an Emacs frame on a Macintosh Carbon display,
 `ns' for an Emacs frame on a GNUstep or Macintosh Cocoa display,
 `pc' for a direct-write MS-DOS frame.
 See also `frame-live-p'.  */)
diff --git a/src/keyboard.c b/src/keyboard.c
index 219b42c2456..716d1101aab 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -7308,10 +7308,6 @@ tty_read_avail_input (struct terminal *terminal,
 void
 handle_async_input ()
 {
-#ifdef BSD4_1
-  extern int select_alarmed;
-#endif
-
   interrupt_input_pending = 0;
 
   while (1)
@@ -7323,10 +7319,6 @@ handle_async_input ()
          0 means there was no keyboard input available.  */
       if (nread <= 0)
         break;
-
-#ifdef BSD4_1
-      select_alarmed = 1;  /* Force the select emulator back to life */
-#endif
     }
 }
 
@@ -7345,10 +7337,6 @@ input_available_signal (signo)
   signal (signo, input_available_signal);
 #endif /* USG */
 
-#ifdef BSD4_1
-  sigisheld (SIGIO);
-#endif
-
 #ifdef SYNC_INPUT
   interrupt_input_pending = 1;
 #else
@@ -7362,9 +7350,6 @@ input_available_signal (signo)
   handle_async_input ();
 #endif
 
-#ifdef BSD4_1
-  sigfree ();
-#endif
   errno = old_errno;
 }
 #endif /* SIGIO */
diff --git a/src/syntax.c b/src/syntax.c
index 0c547c724c9..541411b4d2f 100644
--- a/src/syntax.c
+++ b/src/syntax.c
@@ -1,4 +1,3 @@
-#include <stdio.h>
 /* GNU Emacs routines to deal with syntax tables; also word and list parsing.
    Copyright (C) 1985, 1987, 1993, 1994, 1995, 1997, 1998, 1999, 2001,
                  2002, 2003, 2004, 2005, 2006, 2007, 2008