coteditor/CotEditor
1
0
Fork 0
mirror of https://github.com/coteditor/CotEditor.git synced 2024-09-11 11:25:57 +03:00
Code Issues Projects Releases Wiki Activity

Fix file mapping conflict tables (fix #272)

Browse Source
This commit is contained in:
1024jp 2014-11-16 02:48:55 +01:00
parent 99edbc70e0
commit 6008b10068
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG.md
View File

@ -14,9 +14,10 @@ changelog
### Fixes
- Fix an issue that new documents couldn't be saved with an extension that is automatically added from syntax definition.
- Fix some Japanese localizations.
- Fix an issue that syntax style mapping conflict tables were always blank.
- Fix an issue that current line highlight didn't update after font size change.
- Fix an issue that navigation/status bars are shown for a moment on window creation even they are set as hidden.
- Fix some Japanese localizations.

4
CotEditor/Sources/CESyntaxMappingConflictsSheetController.m
View File

@ -54,8 +54,6 @@
{
self = [super initWithWindowNibName:@"SyntaxMappingConflictSheet"];
if (self) {
[[self window] setLevel:NSModalPanelWindowLevel];
_extensionConflicts = [[self class] parseConflictDict:[[CESyntaxManager sharedManager] extensionConflicts]];
_filenameConflicts = [[self class] parseConflictDict:[[CESyntaxManager sharedManager] filenameConflicts]];
}
@ -95,7 +93,7 @@
@"doubledStyles": [styles componentsJoinedByString:@", "]}];
}
return conflicts;
return [conflicts copy];
}
@end