From: Chong Yidong <cyd@stupidchicken.com>
Date: Fri, 18 Jul 2008 16:54:12 +0000 (+0000)
Subject: Contents of ns-carbon-compat.el moved here.
X-Git-Tag: emacs-pretest-23.0.90~4090
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=2f93961f01383a21dc664a82cc420b681e692b5e;p=emacs.git

Contents of ns-carbon-compat.el moved here.
---

diff --git a/lisp/term/ns-win.el b/lisp/term/ns-win.el
index c53527bc641..88c71543d6d 100644
--- a/lisp/term/ns-win.el
+++ b/lisp/term/ns-win.el
@@ -307,7 +307,15 @@ The properties returned may include `top', `left', `height', and `width'."
 ;;;; 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