From: Dan Nicolaescu Date: Wed, 29 Aug 2007 22:19:43 +0000 (+0000) Subject: * config.in (HAVE_WINDOW_SYSTEM): Don't undef MULTI_KBOARD here... X-Git-Tag: emacs-pretest-23.0.90~11204 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=0f1444e1e179240df3fe4a1a82561c4010cda285;p=emacs.git * config.in (HAVE_WINDOW_SYSTEM): Don't undef MULTI_KBOARD here... * s/darwin.h: ... do it here. --- diff --git a/src/ChangeLog b/src/ChangeLog index e3913a65bd4..3d0007814ff 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2007-08-29 Dan Nicolaescu + + * config.in (HAVE_WINDOW_SYSTEM): Don't undef MULTI_KBOARD here... + * s/darwin.h: ... do it here. + 2007-08-29 Stefan Monnier * lisp.h (set_initial_environment): Rename from set_global_environment. diff --git a/src/config.in b/src/config.in index 59d4b91ed31..475cba5fda6 100644 --- a/src/config.in +++ b/src/config.in @@ -940,8 +940,6 @@ Boston, MA 02110-1301, USA. */ #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 --git a/src/s/darwin.h b/src/s/darwin.h index a2a3d862f80..300fb27e20e 100644 --- a/src/s/darwin.h +++ b/src/s/darwin.h @@ -38,6 +38,9 @@ Boston, MA 02110-1301, USA. */ #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