diff options
| author | Michael Hutchinson <m.j.hutchinson@gmail.com> | 2011-11-15 19:50:37 +0400 |
|---|---|---|
| committer | Michael Hutchinson <m.j.hutchinson@gmail.com> | 2011-11-15 20:00:16 +0400 |
| commit | 21762fd150143378373ff71dcfa7b20c9ff8d1a9 (patch) | |
| tree | c26b20d968d47ec02bffef7404bb62e3cedfc108 /main/src/addins/MonoDevelop.SourceEditor2 | |
| parent | 058ff59b3b35af180aef4fc5ebe1cb0819435088 (diff) | |
| parent | 9a0bcf3d0eb0ebe2940313b65a6e734c97da83cd (diff) | |
Merge remote-tracking branch 'origin/master' into macgtk
Conflicts:
main/src/addins/MonoDevelop.MacDev/MonoDevelop.MacDev.PlistEditor/CustomPropertiesWidget.cs
Diffstat (limited to 'main/src/addins/MonoDevelop.SourceEditor2')
| -rw-r--r-- | main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/SourceEditorView.cs | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/SourceEditorView.cs b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/SourceEditorView.cs index 1f90b6915d..5fcc6efd4a 100644 --- a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/SourceEditorView.cs +++ b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/SourceEditorView.cs @@ -1116,12 +1116,13 @@ namespace MonoDevelop.SourceEditor public void SetCaretTo (int line, int column) { - widget.TextEditor.SetCaretTo (line, column, true); + this.Document.RunWhenLoaded (() => widget.TextEditor.SetCaretTo (line, column, true)); + } public void SetCaretTo (int line, int column, bool highlight) { - widget.TextEditor.SetCaretTo (line, column, highlight); + this.Document.RunWhenLoaded (() => widget.TextEditor.SetCaretTo (line, column, highlight)); } public void Redo() |