Merge branch 'hotfix/1.7.1' into develop

[VERSION] 1.7.1
Merge branch 'develop' into hotfix/1.7.1
2011-07-21 21:06:54 -05:00 · 2011-07-21 21:06:45 -05:00 · 2011-07-21 20:57:47 -05:00 · 2011-07-21 20:53:26 -05:00 · 2011-07-21 20:50:49 -05:00 · 2011-07-21 20:48:03 -05:00
3 changed files with 14 additions and 8 deletions
@@ -44,9 +44,9 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.7</string>
+	<string>1.7.1</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.7</string>
+	<string>1.7.1</string>
 	<key>LSMinimumSystemVersion</key>
 	<string>${MACOSX_DEPLOYMENT_TARGET}</string>
 	<key>NSMainNibFile</key>
@@ -492,7 +492,7 @@
 				);
 				PREBINDING = NO;
 				PRODUCT_NAME = ORCDiscount;
-				RUN_CLANG_STATIC_ANALYZER = YES;
+				RUN_CLANG_STATIC_ANALYZER = NO;
 			};
 			name = Debug;
 		};
@@ -575,7 +575,7 @@
 				GCC_WARN_STRICT_SELECTOR_MATCH = NO;
 				GCC_WARN_UNDECLARED_SELECTOR = YES;
 				GCC_WARN_UNKNOWN_PRAGMAS = YES;
-				GCC_WARN_UNUSED_PARAMETER = YES;
+				GCC_WARN_UNUSED_PARAMETER = NO;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				PREBINDING = NO;
@@ -602,7 +602,7 @@
 				GCC_WARN_STRICT_SELECTOR_MATCH = NO;
 				GCC_WARN_UNDECLARED_SELECTOR = YES;
 				GCC_WARN_UNKNOWN_PRAGMAS = YES;
-				GCC_WARN_UNUSED_PARAMETER = YES;
+				GCC_WARN_UNUSED_PARAMETER = NO;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				PREBINDING = NO;
 				SDKROOT = macosx10.6;
@@ -78,8 +78,13 @@ NSString	*kMarkdownDocumentType = @"MarkdownDocumentType";
 	[super windowControllerDidLoadNib:controller_];
 }

- (BOOL)writeToURL:(NSURL*)absoluteURL_ ofType:(NSString*)typeName_ error:(NSError**)error_ {
-	BOOL result = NO;
+- (BOOL)writeToURL:(NSURL*)absoluteURL_
+    ofType:(NSString*)typeName_
+    forSaveOperation:(NSSaveOperationType)saveOperation_
+    originalContentsURL:(NSURL*)absoluteOriginalContentsURL_
+    error:(NSError **)error_
+{
+    BOOL result = NO;
 	if ([typeName_ isEqualToString:kMarkdownDocumentType]) {
 		[markdownSourceTextView breakUndoCoalescing];
 		result = [[markdownSource string] writeToURL:absoluteURL_
@@ -88,7 +93,8 @@ NSString	*kMarkdownDocumentType = @"MarkdownDocumentType";
 											   error:error_];
 		
 	}
-    if (result && ![self hasUnautosavedChanges]) {
+    
+    if (result && saveOperation_ != NSAutosaveOperation) {
        NSURL *markdownFileURL = [self fileURL];
        NSURL *htmlFileURL = [[markdownFileURL URLByDeletingPathExtension] URLByAppendingPathExtension:@"html"];
        if ([[NSFileManager defaultManager] fileExistsAtPath:[htmlFileURL path]]) {
Author	SHA1	Message	Date
rentzsch	21f4bf11ae	Merge branch 'hotfix/1.7.1' into develop	2011-07-21 21:06:54 -05:00
rentzsch	460b0cae9b	[VERSION] 1.7.1	2011-07-21 21:06:45 -05:00
rentzsch	867540f2a4	Merge branch 'develop' into hotfix/1.7.1	2011-07-21 20:57:47 -05:00
rentzsch	921c71b7da	[FIX] Update HTML sibling even if autosave hasn't taken place yet.	2011-07-21 20:53:26 -05:00
rentzsch	1d96a33c96	RUN_CLANG_STATIC_ANALYZER off for debug builds.	2011-07-21 20:50:49 -05:00
rentzsch	a1b9ee2db6	Disable GCC_WARN_UNUSED_VARIABLE -- it doesn't make sense for Obj-C.	2011-07-21 20:48:03 -05:00
rentzsch	d8413c8708	Merge branch 'release/1.7' into develop	2011-07-20 00:23:40 -05:00