Merge branch 'release/1.2'

CEScriptManager.m

@@ -180,6 +180,17 @@ - (void)buildScriptMenu:(id)sender
             NSLog(@"Error. AppleScriptFolder sample could not copy.");
         }
     }
+    else if (([theFileManager fileExistsAtPath:theSource]) &&
+             ([theFileManager fileExistsAtPath:theDestination]) &&
+             (![theFileManager contentsEqualAtPath:theSource andPath:theDestination])) {
+        // About 文書が更新されている場合の対応
+        if (![theFileManager removeFileAtPath:theDestination handler:nil]) {
+            NSLog(@"Error. AppleScriptFolder about document could not remove.");
+        }
+        if (![theFileManager copyPath:theSource toPath:theDestination handler:nil]) {
+            NSLog(@"Error. AppleScriptFolder about document could not copy.");
+        }
+    }
 
     // メニューデータの読み込みとメニュー構成
     NSMenu *theASMenu = [[[NSApp mainMenu] itemAtIndex:k_scriptMenuIndex] submenu];
@@ -242,6 +253,9 @@ - (void)launchScript:(id)sender
         theModifierPressed = YES;
         if (([theXtsn isEqualToString:@"applescript"]) || ([theXtsn isEqualToString:@"scpt"])) {
             theResult = [[NSWorkspace sharedWorkspace] openFile:thePath withApplication:@"Script Editor"];
+            if (!theResult) {
+                theResult = [[NSWorkspace sharedWorkspace] openFile:thePath withApplication:@"AppleScript Editor"];
+            }
         } else if (([theXtsn isEqualToString:@"sh"]) || ([theXtsn isEqualToString:@"pl"]) || 
                 ([theXtsn isEqualToString:@"php"]) || ([theXtsn isEqualToString:@"rb"]) || 
                 ([theXtsn isEqualToString:@"py"])) {

CETextViewCore.m

@@ -317,7 +317,7 @@ - (void)insertNewline:(id)sender
         NSString *theLineStr = [[self string] substringWithRange:
                     NSMakeRange(theLineRange.location, 
                     theLineRange.length - (NSMaxRange(theLineRange) - NSMaxRange(theSelected)))];
-        NSRange theIndentRange = [theLineStr rangeOfRegularExpressionString:@"^[[:blank:]]+"];
+        NSRange theIndentRange = [theLineStr rangeOfRegularExpressionString:@"^[[:blank:]\t]+"];
 
         // インデントを選択状態で改行入力した時は置換とみなしてオートインデントしない 2008.12.13
         if ((theIndentRange.location != NSNotFound) && 

CotEditor.xcodeproj/project.pbxproj

@@ -31,8 +31,11 @@
 		25B2C24D07FA6BC400F4EFC7 /* CETextViewCore.m in Sources */ = {isa = PBXBuildFile; fileRef = 25B2C24B07FA6BC400F4EFC7 /* CETextViewCore.m */; };
 		6C4216A612DDB9180037690E /* Docs in Resources */ = {isa = PBXBuildFile; fileRef = 6C42169512DDB9180037690E /* Docs */; };
 		6C4216BD12DDB9EB0037690E /* Docs_for_src in Resources */ = {isa = PBXBuildFile; fileRef = 6C4216B512DDB9EB0037690E /* Docs_for_src */; };
+		6C6DAE3E13833C0E007F2326 /* dsa_pub.pem in Resources */ = {isa = PBXBuildFile; fileRef = 6C6DAE3D13833C0E007F2326 /* dsa_pub.pem */; };
 		6C9BF21D12F62D3A0097BFE7 /* CotEditorHelp in Resources */ = {isa = PBXBuildFile; fileRef = 6C9BF21C12F62D3A0097BFE7 /* CotEditorHelp */; };
 		6CA3B3E312E3B59B0019AB2E /* Script in Resources */ = {isa = PBXBuildFile; fileRef = 6CA3B36012E3B59B0019AB2E /* Script */; };
+		6CB074A21373A03B001D0243 /* Sparkle.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6CB074A11373A03B001D0243 /* Sparkle.framework */; };
+		6CB074B11373A0C3001D0243 /* Sparkle.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 6CB074A11373A03B001D0243 /* Sparkle.framework */; };
 		8C081B4B07D0A85A0060191A /* getInfo.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 8C081B4A07D0A85A0060191A /* getInfo.tiff */; };
 		8C0A063D0F748B9900D32B56 /* defaultSyntaxStyle_PHP.plist in Resources */ = {isa = PBXBuildFile; fileRef = 8C0A063C0F748B9900D32B56 /* defaultSyntaxStyle_PHP.plist */; };
 		8C0F52610871861C00ABD124 /* openScriptMenu.applescript in Resources */ = {isa = PBXBuildFile; fileRef = 8C0F52600871861C00ABD124 /* openScriptMenu.applescript */; };
@@ -164,6 +167,7 @@
 				8C7F74FC091C7575005C7598 /* UKFileWatcher.h in CopyFiles */,
 				8C7F7503091C7596005C7598 /* UKMainThreadProxy.h in CopyFiles */,
 				8C38409B0D16B7AC00F76A4C /* UKXattrMetadataStore.h in CopyFiles */,
+				6CB074B11373A0C3001D0243 /* Sparkle.framework in CopyFiles */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -228,9 +232,11 @@
 		6C1E212812C9E65600194313 /* Japanese */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = Japanese; path = Japanese.lproj/SyntaxManager.nib; sourceTree = "<group>"; };
 		6C42169512DDB9180037690E /* Docs */ = {isa = PBXFileReference; lastKnownFileType = folder; path = Docs; sourceTree = "<group>"; };
 		6C4216B512DDB9EB0037690E /* Docs_for_src */ = {isa = PBXFileReference; lastKnownFileType = folder; path = Docs_for_src; sourceTree = "<group>"; };
+		6C6DAE3D13833C0E007F2326 /* dsa_pub.pem */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = dsa_pub.pem; sourceTree = "<group>"; };
 		6C9BF1C412F62D310097BFE7 /* English */ = {isa = PBXFileReference; lastKnownFileType = folder; name = English; path = English.lproj/CotEditorHelp; sourceTree = "<group>"; };
 		6C9BF27412F62E210097BFE7 /* Japanese */ = {isa = PBXFileReference; lastKnownFileType = folder; name = Japanese; path = Japanese.lproj/CotEditorHelp; sourceTree = "<group>"; };
 		6CA3B36012E3B59B0019AB2E /* Script */ = {isa = PBXFileReference; lastKnownFileType = folder; path = Script; sourceTree = "<group>"; };
+		6CB074A11373A03B001D0243 /* Sparkle.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = Sparkle.framework; sourceTree = "<group>"; };
 		8C081B4A07D0A85A0060191A /* getInfo.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = getInfo.tiff; path = toolbarIcons/getInfo.tiff; sourceTree = "<group>"; };
 		8C0A063C0F748B9900D32B56 /* defaultSyntaxStyle_PHP.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = defaultSyntaxStyle_PHP.plist; path = SyntaxColorings/defaultSyntaxStyle_PHP.plist; sourceTree = "<group>"; };
 		8C0F52600871861C00ABD124 /* openScriptMenu.applescript */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.applescript; name = openScriptMenu.applescript; path = internalScript/openScriptMenu.applescript; sourceTree = "<group>"; };
@@ -375,6 +381,7 @@
 				8D15AC340486D014006FF6A4 /* Cocoa.framework in Frameworks */,
 				8C3289F007A21422001CA481 /* OgreKit.framework in Frameworks */,
 				8C49094607F441510072AAE9 /* Carbon.framework in Frameworks */,
+				6CB074A21373A03B001D0243 /* Sparkle.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -385,6 +392,7 @@
 			isa = PBXGroup;
 			children = (
 				1058C7A7FEA54F5311CA2CBB /* Cocoa.framework */,
+				6CB074A11373A03B001D0243 /* Sparkle.framework */,
 			);
 			name = "Linked Frameworks";
 			sourceTree = "<group>";
@@ -586,6 +594,7 @@
 				25D4C01C07B87595007CB113 /* icons */,
 				8CB0122007CA0CCD00221EDC /* toolbarIcons */,
 				25972A7107B87293005EB175 /* images */,
+				6C6DAE3D13833C0E007F2326 /* dsa_pub.pem */,
 				8D15AC360486D014006FF6A4 /* Info.plist */,
 				259C2316077678DE00BA61C5 /* Localizable.strings */,
 				089C165FFE840EACC02AAC07 /* InfoPlist.strings */,
@@ -830,6 +839,7 @@
 				6C4216A612DDB9180037690E /* Docs in Resources */,
 				6C4216BD12DDB9EB0037690E /* Docs_for_src in Resources */,
 				6C9BF21D12F62D3A0097BFE7 /* CotEditorHelp in Resources */,
+				6C6DAE3E13833C0E007F2326 /* dsa_pub.pem in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -993,7 +1003,10 @@
 				ARCHS = "$(ARCHS_STANDARD_32_BIT)";
 				COPY_PHASE_STRIP = NO;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
-				FRAMEWORK_SEARCH_PATHS = .;
+				FRAMEWORK_SEARCH_PATHS = (
+					.,
+					"\"$(SRCROOT)\"",
+				);
 				GCC_DEBUGGING_SYMBOLS = full;
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_ENABLE_FIX_AND_CONTINUE = YES;
@@ -1019,7 +1032,10 @@
 				ARCHS = "$(ARCHS_STANDARD_32_BIT)";
 				COPY_PHASE_STRIP = YES;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
-				FRAMEWORK_SEARCH_PATHS = .;
+				FRAMEWORK_SEARCH_PATHS = (
+					.,
+					"\"$(SRCROOT)\"",
+				);
 				GCC_DYNAMIC_NO_PIC = YES;
 				GCC_ENABLE_FIX_AND_CONTINUE = NO;
 				GCC_GENERATE_DEBUGGING_SYMBOLS = YES;

Docs/EN/History-en.rtf

@@ -1,7 +1,7 @@
 {\rtf1\ansi\ansicpg932\cocoartf1038\cocoasubrtf350
 \readonlydoc1{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
 {\colortbl;\red255\green255\blue255;}
-\paperw11900\paperh16840\margl1440\margr1440\vieww13720\viewh11800\viewkind0
+\vieww9000\viewh8400\viewkind0
 \pard\tx565\tx1133\tx1700\tx2266\tx2832\tx3401\tx3967\tx4535\tx5102\tx5669\tx6235\tx6802\ql\qnatural
 
 \f0\b\fs32 \cf0 CotEditor
@@ -13,11 +13,29 @@
 \pard\tx565\tx1133\tx1700\tx2266\tx2832\tx3401\tx3967\tx4535\tx5102\tx5669\tx6235\tx6802\ql\qnatural
 
 \fs24 \cf0 \
+\pard\tx565\tx1133\tx1700\tx2266\tx2832\tx3401\tx3967\tx4535\tx5102\tx5669\tx6235\tx6802\ql\qnatural
 
-\b 1.1.1 [2011.04.06]\
+\b \cf0 1.2 [2011.05.23]\
 \pard\tx565\tx1133\tx1700\tx2266\tx2832\tx3401\tx3967\tx4535\tx5102\tx5669\tx6235\tx6802\ql\qnatural
 
 \b0 \cf0 \ul \ulc0 <New Features>\ulnone \
+*  Add feature for automatically update.\
+\
+\ul <Additions/Changes>\ulnone \
+*  Change the application icon. (thanks to kanai-san)\
+*  Updated 'About The ScriptMenu Folder' document.\
+\
+\ul <Fixes>\ulnone \
+*  Fixed a bug that ignore tab in auto indent.\
+*  Fixed a bug that cannot open AppleScript Editor for 10.6 by Option+Click on script menu.\
+\
+\
+\pard\tx565\tx1133\tx1700\tx2266\tx2832\tx3401\tx3967\tx4535\tx5102\tx5669\tx6235\tx6802\ql\qnatural
+
+\b \cf0 1.1.1 [2011.04.06]\
+\pard\tx565\tx1133\tx1700\tx2266\tx2832\tx3401\tx3967\tx4535\tx5102\tx5669\tx6235\tx6802\ql\qnatural
+
+\b0 \cf0 \ul <New Features>\ulnone \
 (None)\
 \
 \ul <Additions/Changes>\ulnone \

Docs/EN/ReadMe-en.rtf

@@ -4,11 +4,11 @@
 \vieww9000\viewh8400\viewkind0
 \pard\tx565\tx1133\tx1700\tx2266\tx2832\tx3401\tx3967\tx4535\tx5102\tx5669\tx6235\tx6802\ql\qnatural
 
-\f0\b\fs30 \cf0 CotEditor 1.1.1\
+\f0\b\fs30 \cf0 CotEditor 1.2\
 ReadMe\
 \pard\tx565\tx1133\tx1700\tx2266\tx2832\tx3401\tx3967\tx4535\tx5102\tx5669\tx6235\tx6802\qr
 
-\b0\fs24 \cf0 2011.04.06\
+\b0\fs24 \cf0 2011.05.23\
 \
 \pard\tx565\tx1133\tx1700\tx2266\tx2832\tx3401\tx3967\tx4535\tx5102\tx5669\tx6235\tx6802\ql\qnatural
 
@@ -141,4 +141,4 @@ Also, thanks to the information regarding the use of UKKQueue by kimura wataru (
 *  Thanks to mi by Daisuke Kamiyama ({\field{\*\fldinst{HYPERLINK "http://www.mimikaki.net/"}}{\fldrslt http://www.mimikaki.net/}}) on which the pre-formatted strings of CotEditor's File Drop function are based.\
 \pard\tx565\tx1133\tx1700\tx2266\tx2832\tx3401\tx3967\tx4535\tx5102\tx5669\tx6235\tx6802\ql\qnatural
 \cf0 \
-}
+}

Docs/JP/History-jp.rtf

@@ -1,29 +1,49 @@
 {\rtf1\ansi\ansicpg932\cocoartf1038\cocoasubrtf350
 \readonlydoc1{\fonttbl\f0\fswiss\fcharset0 Helvetica;\f1\fnil\fcharset128 HiraKakuPro-W3;}
 {\colortbl;\red255\green255\blue255;}
-\paperw11900\paperh16840\margl1440\margr1440\vieww13720\viewh11800\viewkind0
+\vieww9000\viewh8400\viewkind0
 \pard\tx565\tx1133\tx1700\tx2266\tx2832\tx3401\tx3967\tx4535\tx5102\tx5669\tx6235\tx6802\ql\qnatural
 
 \f0\b\fs30 \cf0 CotEditor\
+\pard\tx565\tx1133\tx1700\tx2266\tx2832\tx3401\tx3967\tx4535\tx5102\tx5669\tx6235\tx6802\ql\qnatural
 
-\f1\fs26 \'83\'6f\'81\'5b\'83\'57\'83\'87\'83\'93\'97\'9a\'97\'f0
+\f1\fs26 \cf0 \'83\'6f\'81\'5b\'83\'57\'83\'87\'83\'93\'97\'9a\'97\'f0
 \f0\b0  :\
+\pard\tx565\tx1133\tx1700\tx2266\tx2832\tx3401\tx3967\tx4535\tx5102\tx5669\tx6235\tx6802\ql\qnatural
 
-\fs24 \
+\fs24 \cf0 \
+\pard\tx565\tx1133\tx1700\tx2266\tx2832\tx3401\tx3967\tx4535\tx5102\tx5669\tx6235\tx6802\ql\qnatural
 
-\b 1.1.1 [2011.04.06]
+\b \cf0 1.2 [2011.05.23]
 \b0 \
 \pard\tx565\tx1133\tx1700\tx2266\tx2832\tx3401\tx3967\tx4535\tx5102\tx5669\tx6235\tx6802\ql\qnatural
 
 \f1 \cf0 \ul \ulc0 \'81\'83\'90\'56\'8b\'40\'94\'5c\'81\'84\
 \pard\tx565\tx1133\tx1700\tx2266\tx2832\tx3401\tx3967\tx4535\tx5102\tx5669\tx6235\tx6802\ql\qnatural
-\cf0 \ulnone \'81\'69\'82\'c8\'82\'b5\'81\'6a\
+\cf0 \ulnone *  \'8e\'a9\'93\'ae\'83\'41\'83\'62\'83\'76\'83\'66\'81\'5b\'83\'67\'8b\'40\'94\'5c\'82\'f0\'92\'c7\'89\'c1\
 \pard\tx565\tx1133\tx1700\tx2266\tx2832\tx3401\tx3967\tx4535\tx5102\tx5669\tx6235\tx6802\ql\qnatural
 \cf0 \ul \'81\'83\'92\'c7\'89\'c1\'81\'5e\'8f\'43\'90\'b3\'81\'5e\'95\'cf\'8d\'58\'81\'84\ulnone \
+*  \'83\'41\'83\'76\'83\'8a\'83\'50\'81\'5b\'83\'56\'83\'87\'83\'93\'82\'cc\'83\'41\'83\'43\'83\'52\'83\'93\'82\'f0\'95\'cf\'8d\'58\'81\'69kanai \'82\'b3\'82\'f1\'82\'c9\'8a\'b4\'8e\'d3\'81\'49\'81\'6a\
+*  \'81\'75ScriptMenu \'83\'74\'83\'48\'83\'8b\'83\'5f\'82\'c9\'82\'c2\'82\'a2\'82\'c4\'81\'76\'82\'cc\'83\'68\'83\'4c\'83\'85\'83\'81\'83\'93\'83\'67\'82\'f0\'8d\'58\'90\'56\
+\ul \'81\'83\'83\'6f\'83\'4f\'83\'74\'83\'42\'83\'62\'83\'4e\'83\'58\'81\'84\ulnone \
+*  \'8e\'a9\'93\'ae\'83\'43\'83\'93\'83\'66\'83\'93\'83\'67\'82\'c5\'83\'5e\'83\'75\'82\'aa\'96\'b3\'8e\'8b\'82\'b3\'82\'ea\'82\'c4\'82\'a2\'82\'bd\'95\'73\'8b\'ef\'8d\'87\'82\'f0\'8f\'43\'90\'b3\
+*  10.6\'82\'c9\'82\'a8\'82\'a2\'82\'c4\'81\'41\'83\'58\'83\'4e\'83\'8a\'83\'76\'83\'67\'83\'81\'83\'6a\'83\'85\'81\'5b\'8f\'e3\'82\'ccOption\'81\'7b\'83\'4e\'83\'8a\'83\'62\'83\'4e\'82\'c5AppleScript\'83\'47\'83\'66\'83\'42\'83\'5e\'82\'aa\'8a\'4a\'82\'a9\'82\'c8\'82\'a9\'82\'c1\'82\'bd\'82\'cc\'82\'f0\'8f\'43\'90\'b3\
 \pard\tx565\tx1133\tx1700\tx2266\tx2832\tx3401\tx3967\tx4535\tx5102\tx5669\tx6235\tx6802\ql\qnatural
-\cf0 \'81\'69\'82\'c8\'82\'b5\'81\'6a\
+
+\f0 \cf0 \
+\pard\tx565\tx1133\tx1700\tx2266\tx2832\tx3401\tx3967\tx4535\tx5102\tx5669\tx6235\tx6802\ql\qnatural
+
+\b \cf0 1.1.1 [2011.04.06]
+\b0 \
 \pard\tx565\tx1133\tx1700\tx2266\tx2832\tx3401\tx3967\tx4535\tx5102\tx5669\tx6235\tx6802\ql\qnatural
-\cf0 \ul \ulc0 \'81\'83\'83\'6f\'83\'4f\'83\'74\'83\'42\'83\'62\'83\'4e\'83\'58\'81\'84\ulnone \
+
+\f1 \cf0 \ul \'81\'83\'90\'56\'8b\'40\'94\'5c\'81\'84\
+\pard\tx565\tx1133\tx1700\tx2266\tx2832\tx3401\tx3967\tx4535\tx5102\tx5669\tx6235\tx6802\ql\qnatural
+\cf0 \ulnone \'81\'69\'82\'c8\'82\'b5\'81\'6a\
+\pard\tx565\tx1133\tx1700\tx2266\tx2832\tx3401\tx3967\tx4535\tx5102\tx5669\tx6235\tx6802\ql\qnatural
+\cf0 \ul \'81\'83\'92\'c7\'89\'c1\'81\'5e\'8f\'43\'90\'b3\'81\'5e\'95\'cf\'8d\'58\'81\'84\ulnone \
+\'81\'69\'82\'c8\'82\'b5\'81\'6a\
+\ul \'81\'83\'83\'6f\'83\'4f\'83\'74\'83\'42\'83\'62\'83\'4e\'83\'58\'81\'84\ulnone \
 *  \'88\'ea\'95\'94\'8a\'c2\'8b\'ab\'82\'c5\'8b\'4e\'93\'ae\'82\'c5\'82\'ab\'82\'c8\'82\'a2\'95\'73\'8b\'ef\'8d\'87\'82\'f0\'8f\'43\'90\'b3\'81\'69OgreKit\'82\'f0SDK 10.4\'82\'c5\'83\'8a\'83\'72\'83\'8b\'83\'68\'81\'6a\
 \pard\tx565\tx1133\tx1700\tx2266\tx2832\tx3401\tx3967\tx4535\tx5102\tx5669\tx6235\tx6802\ql\qnatural
 
@@ -34,7 +54,7 @@
 \b0 \
 \pard\tx565\tx1133\tx1700\tx2266\tx2832\tx3401\tx3967\tx4535\tx5102\tx5669\tx6235\tx6802\ql\qnatural
 
-\f1 \cf0 \ul \ulc0 \'81\'83\'90\'56\'8b\'40\'94\'5c\'81\'84\
+\f1 \cf0 \ul \'81\'83\'90\'56\'8b\'40\'94\'5c\'81\'84\
 \pard\tx565\tx1133\tx1700\tx2266\tx2832\tx3401\tx3967\tx4535\tx5102\tx5669\tx6235\tx6802\ql\qnatural
 \cf0 \ulnone \'81\'69\'82\'c8\'82\'b5\'81\'6a\
 \pard\tx565\tx1133\tx1700\tx2266\tx2832\tx3401\tx3967\tx4535\tx5102\tx5669\tx6235\tx6802\ql\qnatural

Docs/JP/ReadMe-jp.rtf

@@ -5,11 +5,11 @@
 \vieww9000\viewh8400\viewkind0
 \pard\tx565\tx1133\tx1700\tx2266\tx2832\tx3401\tx3967\tx4535\tx5102\tx5669\tx6235\tx6802\ql\qnatural
 
-\f0\b\fs30 \cf0 CotEditor 1.1.1\
+\f0\b\fs30 \cf0 CotEditor 1.2\
 ReadMe\
 \pard\tx565\tx1133\tx1700\tx2266\tx2832\tx3401\tx3967\tx4535\tx5102\tx5669\tx6235\tx6802\qr
 
-\b0\fs24 \cf0 2011.04.06\
+\b0\fs24 \cf0 2011.05.23\
 \
 \pard\tx565\tx1133\tx1700\tx2266\tx2832\tx3401\tx3967\tx4535\tx5102\tx5669\tx6235\tx6802\ql\qnatural
 
@@ -337,4 +337,4 @@ Copyright (c) 2008 John Engelhart\
 \f0 \
 \pard\tx565\tx1133\tx1700\tx2266\tx2832\tx3401\tx3967\tx4535\tx5102\tx5669\tx6235\tx6802\ql\qnatural
 \cf0 \
-}
+}