* term.c (init_tty): Use terminal specific mouse_position_hook.

* macterm.c (mac_create_terminal): Indent and rearrange to be more
similar to the X11 version.
* config.in: Disable multi-keyboard support on a mac.
* loadup.el: Use a better feature test on a mac.

2 files changed, 5 insertions, 1 deletions

diff --git a/lisp/ChangeLog.multi-tty b/lisp/ChangeLog.multi-tty
index 257281bca57..8e18674db8b 100644
--- a/lisp/ChangeLog.multi-tty
+++ b/lisp/ChangeLog.multi-tty
@@ -1,3 +1,7 @@
+2007-06-03  Dan Nicolaescu  <dann@ics.uci.edu>
+
+        * loadup.el: Use a better feature test on a mac.
+
 2007-05-20  L$,1 q(Brentey K,Aa(Broly  <lorentey@elte.hu>
 
         * server.el (server-process-filter): Don't change
diff --git a/lisp/loadup.el b/lisp/loadup.el
index d9362158380..8cadd734cb8 100644
--- a/lisp/loadup.el
+++ b/lisp/loadup.el
@@ -212,7 +212,7 @@
 (if (eq system-type 'macos)
     (progn
       (load "ls-lisp")))
-(if (and (eq system-type 'darwin) (not (featurep 'x)))
+(if (featurep 'mac-carbon)
     (progn
       (load "term/mac-win")))
 (if (fboundp 'atan)     ; preload some constants and