From 382f00014db8e3db113a80bd7053208ce4d4e497 Mon Sep 17 00:00:00 2001
From: Bjorn Winckler <bjorn.winckler@gmail.com>
Date: Fri, 30 Jul 2010 17:04:48 +0200
Subject: [PATCH] Revert "Support for Cocoa Standard AS Dictionary"

This reverts commit fb3590e751462356b436228689579a91ece7eb0d.

Conflicts:

	src/MacVim/MacVim.xcodeproj/project.pbxproj
---
 src/MacVim/Info.plist                       | 2 --
 src/MacVim/MacVim.sdef                      | 5 -----
 src/MacVim/MacVim.xcodeproj/project.pbxproj | 4 ----
 3 files changed, 11 deletions(-)
 delete mode 100644 src/MacVim/MacVim.sdef

diff --git a/src/MacVim/Info.plist b/src/MacVim/Info.plist
index 00610b9899..7008e615e7 100644
--- a/src/MacVim/Info.plist
+++ b/src/MacVim/Info.plist
@@ -1251,8 +1251,6 @@
 	<string>http://bjorn.winckler.googlepages.com/macvim_latest.xml</string>
 	<key>NSAppleScriptEnabled</key>
 	<true/>
-	<key>OSAScriptingDefinition</key>
-	<string>MacVim.sdef</string>
 
 	<!-- In order for Quick Look to work we must add entries to
              UTExportedTypeDeclarations.  When possible a "proper" UTI is used,
diff --git a/src/MacVim/MacVim.sdef b/src/MacVim/MacVim.sdef
deleted file mode 100644
index d02562aef1..0000000000
--- a/src/MacVim/MacVim.sdef
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE dictionary SYSTEM "file://localhost/System/Library/DTDs/sdef.dtd">
-<dictionary xmlns:xi="http://www.w3.org/2003/XInclude">
-  <xi:include href="file:///System/Library/ScriptingDefinitions/CocoaStandard.sdef" xpointer="xpointer(/dictionary/suite)"/>
-</dictionary>
\ No newline at end of file
diff --git a/src/MacVim/MacVim.xcodeproj/project.pbxproj b/src/MacVim/MacVim.xcodeproj/project.pbxproj
index a07888eb64..b12e098929 100644
--- a/src/MacVim/MacVim.xcodeproj/project.pbxproj
+++ b/src/MacVim/MacVim.xcodeproj/project.pbxproj
@@ -69,7 +69,6 @@
 		8D11072B0486CEB800E47090 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 089C165CFE840E0CC02AAC07 /* InfoPlist.strings */; };
 		8D11072D0486CEB800E47090 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 29B97316FDCFA39411CA2CEA /* main.m */; settings = {ATTRIBUTES = (); }; };
 		8D11072F0486CEB800E47090 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */; };
-		B59228A611F7572F00E7F584 /* MacVim.sdef in Resources */ = {isa = PBXBuildFile; fileRef = B59228A511F7572F00E7F584 /* MacVim.sdef */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -212,7 +211,6 @@
 		32CA4F630368D1EE00C91783 /* MacVim_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MacVim_Prefix.pch; sourceTree = "<group>"; };
 		8D1107310486CEB800E47090 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist; path = Info.plist; sourceTree = "<group>"; };
 		8D1107320486CEB800E47090 /* MacVim.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = MacVim.app; sourceTree = BUILT_PRODUCTS_DIR; };
-		B59228A511F7572F00E7F584 /* MacVim.sdef */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.sdef; path = MacVim.sdef; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -384,7 +382,6 @@
 		29B97317FDCFA39411CA2CEA /* Resources */ = {
 			isa = PBXGroup;
 			children = (
-				B59228A511F7572F00E7F584 /* MacVim.sdef */,
 				1D384A0D100D671700D3C22F /* KeyBinding.plist */,
 				1D9C602E0EF79C0C0034AD44 /* MacVim.icns */,
 				1D8BEA73104992290069B072 /* FindAndReplace.nib */,
@@ -522,7 +519,6 @@
 				1D8BEA74104992290069B072 /* FindAndReplace.nib in Resources */,
 				1D9C60520EF79C0C0034AD44 /* MacVim.icns in Resources */,
 				1D384A0E100D671700D3C22F /* KeyBinding.plist in Resources */,
-				B59228A611F7572F00E7F584 /* MacVim.sdef in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};