# HG changeset patch
# User Chong Yidong <cyd@stupidchicken.com>
# Date 1216400052 0
# Node ID c4b6acf322cc1f30d63e99eff8c4b3c7252db96a
# Parent  aee36828429f1c2a00b09dafbde94bfd08e1c59e
Contents of ns-carbon-compat.el moved here.

diff -r aee36828429f -r c4b6acf322cc lisp/term/ns-win.el
--- a/lisp/term/ns-win.el	Fri Jul 18 16:53:55 2008 +0000
+++ b/lisp/term/ns-win.el	Fri Jul 18 16:54:12 2008 +0000
@@ -307,7 +307,15 @@
 ;;;; defined below
 
 (autoload 'ns-grabenv "ns-grabenv" "Get environment from your shell." t nil)
-(load "ns-carbon-compat")
+
+;; Set up a number of aliases and other layers to pretend we're using
+;; the Choi/Mitsuharu Carbon port.
+
+(defvaralias 'mac-allow-anti-aliasing 'ns-antialias-text)
+(defvaralias 'mac-command-modifier 'ns-command-modifier)
+(defvaralias 'mac-control-modifier 'ns-control-modifier)
+(defvaralias 'mac-option-modifier 'ns-option-modifier)
+(defvaralias 'mac-function-modifier 'ns-function-modifier)
 
 ;; alt-up/down scrolling a la Stuart.app
 ;; only activated if ns-extended-platform-support is on