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

diff --git a/lisp/term/ns-win.el b/lisp/term/ns-win.el
index c53527bc641458ea7e602ba31174a9543a4277a7..88c71543d6d09d4fde32124c753e42a8fb0bfb76 100644 (file)
--- 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