aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorDan Nicolaescu2007-09-11 01:04:00 +0000
committerDan Nicolaescu2007-09-11 01:04:00 +0000
commitb7ea08942c4989c54b24d4d4db7157d89862e61b (patch)
treeac0dce9df20b93d186c01c714f5c66eb51c37245 /src
parent22a582554e4a60dcc6a30e6d743dcff39eab9b17 (diff)
downloademacs-b7ea08942c4989c54b24d4d4db7157d89862e61b.tar.gz
emacs-b7ea08942c4989c54b24d4d4db7157d89862e61b.zip
* s/darwin.h (MULTI_KBOARD): Only define for Carbon.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog2
-rw-r--r--src/s/darwin.h7
2 files changed, 6 insertions, 3 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index c1a03ed3e85..6b31cebce49 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,7 @@
12007-09-10 Dan Nicolaescu <dann@ics.uci.edu> 12007-09-10 Dan Nicolaescu <dann@ics.uci.edu>
2 2
3 * s/darwin.h (MULTI_KBOARD): Only define for Carbon.
4
3 * xterm.c (x_create_terminal): Add comment. 5 * xterm.c (x_create_terminal): Add comment.
4 6
5 * term.c (clear_tty_hooks, set_tty_hooks): Add comments. 7 * term.c (clear_tty_hooks, set_tty_hooks): Add comments.
diff --git a/src/s/darwin.h b/src/s/darwin.h
index 300fb27e20e..6bfa0e95106 100644
--- a/src/s/darwin.h
+++ b/src/s/darwin.h
@@ -38,9 +38,6 @@ Boston, MA 02110-1301, USA. */
38#define BSD_SYSTEM 38#define BSD_SYSTEM
39/* #define VMS */ 39/* #define VMS */
40 40
41/* XXX The MULTI_KBOARD support does not work yet on this platform. */
42#undef MULTI_KBOARD
43
44#if 0 /* Don't define DARWIN on Mac OS X because CoreFoundation.h uses 41#if 0 /* Don't define DARWIN on Mac OS X because CoreFoundation.h uses
45 it to distinguish Mac OS X from bare Darwin. */ 42 it to distinguish Mac OS X from bare Darwin. */
46#ifndef DARWIN 43#ifndef DARWIN
@@ -55,6 +52,10 @@ Boston, MA 02110-1301, USA. */
55#define MAC_OS 52#define MAC_OS
56/* We need a little extra space, see ../../lisp/loadup.el. */ 53/* We need a little extra space, see ../../lisp/loadup.el. */
57#define SYSTEM_PURESIZE_EXTRA 30000 54#define SYSTEM_PURESIZE_EXTRA 30000
55
56/* XXX The MULTI_KBOARD support does not work yet on this platform. */
57#undef MULTI_KBOARD
58
58#endif 59#endif
59#endif 60#endif
60 61