Permalink
Browse files

Merge branch 'develop' into hotfix/1.7.1

  • Loading branch information...
2 parents 5346b81 + 921c71b commit 867540f2a4fd47562adcce50fc702d6c16f51685 @rentzsch committed Jul 22, 2011
Showing with 12 additions and 6 deletions.
  1. +3 −3 MarkdownLive.xcodeproj/project.pbxproj
  2. +9 −3 MyDocument.m
@@ -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;
View
@@ -78,8 +78,13 @@ - (void)windowControllerDidLoadNib:(NSWindowController *)controller_ {
[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 @@ - (BOOL)writeToURL:(NSURL*)absoluteURL_ ofType:(NSString*)typeName_ error:(NSErr
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]]) {

0 comments on commit 867540f

Please sign in to comment.