mirror of
https://github.com/coteditor/CotEditor.git
synced 2024-09-11 11:25:57 +03:00
Fix file mapping conflict tables (fix #272)
This commit is contained in:
parent
99edbc70e0
commit
6008b10068
@ -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.
|
||||
|
||||
|
||||
|
||||
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user