diff --git a/trunk/Editor/SyntaxRichTextBox.cs b/trunk/Editor/SyntaxRichTextBox.cs index 61e622f..2a1866a 100644 --- a/trunk/Editor/SyntaxRichTextBox.cs +++ b/trunk/Editor/SyntaxRichTextBox.cs @@ -899,9 +899,15 @@ namespace LSLEditor public new void Paste() { - ResetHighlichting(); + ResetHighlighting(); - if (Clipboard.GetDataObject().GetDataPresent(DataFormats.Text, true)) + // First try with Unicode + if (Clipboard.GetDataObject().GetDataPresent(DataFormats.UnicodeText, true)) + { + string strTextToPaste = Clipboard.GetDataObject().GetData(DataFormats.UnicodeText, true).ToString().Replace("\r", ""); + this.ColoredText = strTextToPaste; + } // failing that try ANSI text. + else if (Clipboard.GetDataObject().GetDataPresent(DataFormats.Text, true)) { string strTextToPaste = Clipboard.GetDataObject().GetData(DataFormats.Text, true).ToString().Replace("\r", ""); this.ColoredText = strTextToPaste; @@ -1147,7 +1153,7 @@ namespace LSLEditor protected override void OnKeyPress(KeyPressEventArgs e) { - ResetHighlichting(); + ResetHighlighting(); char keyChar = e.KeyChar; @@ -1743,7 +1749,7 @@ namespace LSLEditor { BeginUpdate(); - ResetHighlichting(); + ResetHighlighting(); string strW = GetNewWhiteSpace(-1); int intTabs = (int)(strW.Length / AutoFormatter.GetTab().Length); @@ -1892,7 +1898,7 @@ namespace LSLEditor } } - private void ResetHighlichting() + private void ResetHighlighting() { if (HighLightList.Count == 0) return; diff --git a/trunk/Resource/ReleaseNotes.htm b/trunk/Resource/ReleaseNotes.htm index 98c683f..f987402 100644 --- a/trunk/Resource/ReleaseNotes.htm +++ b/trunk/Resource/ReleaseNotes.htm @@ -5,25 +5,27 @@
-

2012 - Release 2.x.x

- * Added +

2012-01 - Release 2.x.x

+ - Added - * Changed + - Changed - * Bugs Fixed: + - Fixed: