diff options
| author | Vsevolod Kukol <sevoku@microsoft.com> | 2019-06-12 19:18:59 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-12 19:18:59 +0300 |
| commit | 8d903ab797c03488fd3706a4ddd781149595be7f (patch) | |
| tree | a02d7e633296bca02f2a5b115cfab20e89fd8583 | |
| parent | 7d2574160b9457a0b7a156c656766b4e0903c2bc (diff) | |
| parent | 111c09c8987ba026d4dcc7bd88e479703d24bc54 (diff) | |
Merge pull request #7808 from mono/master-fixOldEditorSettings
Fix old editor settings/issues
| -rw-r--r-- | main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/TextEditorViewContent.cs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/TextEditorViewContent.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/TextEditorViewContent.cs index be65a8e4a2..a9a219aa0f 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/TextEditorViewContent.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/TextEditorViewContent.cs @@ -76,6 +76,7 @@ namespace MonoDevelop.Ide.Editor { fileDescriptor = modelDescriptor as FileDescriptor; await base.OnInitialize (modelDescriptor, status); + Encoding = fileDescriptor.Encoding; } protected override async Task<Control> OnGetViewControlAsync (CancellationToken token, DocumentViewContent view) @@ -87,6 +88,7 @@ namespace MonoDevelop.Ide.Editor await Init (editor, impl); HasUnsavedChanges = impl.IsDirty; + await UpdateStyleParent (Owner, editor.MimeType, token); // Editor extensions can provide additional content NotifyContentChanged (); |