# HG changeset patch
# User Dan Nicolaescu <dann@ics.uci.edu>
# Date 1188425983 0
# Node ID 7b7c42786f4a00daee51b35362c9c8a252e539d7
# Parent  4bdc932ccd9a79702c220e5b8d0d744e4826bde8
* config.in (HAVE_WINDOW_SYSTEM): Don't undef MULTI_KBOARD here...
* s/darwin.h: ... do it here.

diff -r 4bdc932ccd9a -r 7b7c42786f4a src/ChangeLog
--- a/src/ChangeLog	Wed Aug 29 21:50:39 2007 +0000
+++ b/src/ChangeLog	Wed Aug 29 22:19:43 2007 +0000
@@ -1,3 +1,8 @@
+2007-08-29  Dan Nicolaescu  <dann@ics.uci.edu>
+
+	* config.in (HAVE_WINDOW_SYSTEM): Don't undef MULTI_KBOARD here...
+	* s/darwin.h: ... do it here.
+
 2007-08-29  Stefan Monnier  <monnier@iro.umontreal.ca>
 
 	* lisp.h (set_initial_environment): Rename from set_global_environment.
diff -r 4bdc932ccd9a -r 7b7c42786f4a src/config.in
--- a/src/config.in	Wed Aug 29 21:50:39 2007 +0000
+++ b/src/config.in	Wed Aug 29 22:19:43 2007 +0000
@@ -940,8 +940,6 @@
 #ifdef HAVE_CARBON
 #define HAVE_WINDOW_SYSTEM
 #define HAVE_MOUSE
-/* XXX The MULTI_KBOARD support does not work yet on this platform. */
-#undef MULTI_KBOARD
 #endif
 
 /* Define USER_FULL_NAME to return a string
diff -r 4bdc932ccd9a -r 7b7c42786f4a src/s/darwin.h
--- a/src/s/darwin.h	Wed Aug 29 21:50:39 2007 +0000
+++ b/src/s/darwin.h	Wed Aug 29 22:19:43 2007 +0000
@@ -38,6 +38,9 @@
 #define BSD_SYSTEM
 /* #define VMS */
 
+/* XXX The MULTI_KBOARD support does not work yet on this platform. */
+#undef MULTI_KBOARD
+
 #if 0 /* Don't define DARWIN on Mac OS X because CoreFoundation.h uses
 	 it to distinguish Mac OS X from bare Darwin.  */
 #ifndef	DARWIN