Mercurial > emacs
changeset 83769:7b7c42786f4a
* config.in (HAVE_WINDOW_SYSTEM): Don't undef MULTI_KBOARD here...
* s/darwin.h: ... do it here.
| author | Dan Nicolaescu <dann@ics.uci.edu> |
|---|---|
| date | Wed, 29 Aug 2007 22:19:43 +0000 |
| parents | 4bdc932ccd9a |
| children | 9109a293afb7 |
| files | src/ChangeLog src/config.in src/s/darwin.h |
| diffstat | 3 files changed, 8 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- 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.
--- 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
--- 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