Fixed build.

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/trunk@5207 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61

src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/CodeEditorView.cs

@@ -65,12 +65,9 @@ namespace ICSharpCode.AvalonEdit.AddIn
 			 * ITextEditor.Language gets set in CodeEditorAdapter.FileNameChanged, which is called after
 			 * loading of the document has finished.
 			 * */
-			if (activeAdapter.Language != null) {
-				var bracketSearchResult = activeAdapter.Language.BracketSearcher.SearchBracket(activeAdapter.Document, activeAdapter.Caret.Offset);
-				if (activeAdapter == primaryTextEditorAdapter)
-					this.primaryBracketRenderer.SetHighlight(bracketSearchResult);
-				else
-					this.secondaryBracketRenderer.SetHighlight(bracketSearchResult);
+			if (this.Adapter.Language != null) {
+				var bracketSearchResult = this.Adapter.Language.BracketSearcher.SearchBracket(this.Adapter.Document, this.TextArea.Caret.Offset);
+				this.bracketRenderer.SetHighlight(bracketSearchResult);
 			}
 		}
 		

src/AddIns/Misc/Profiler/Hook/Callback.cpp

@@ -34,7 +34,7 @@ void _declspec(naked) FunctionEnterNaked(FunctionID functionID, UINT_PTR clientD
 		//     + 28   -> argumentInfo    /
 		
 		sub esp, FrameSize
-		// eax, ecx and edx are scratch registers in stdcall, so we need to save those
+		// eax, ecx and edx are scratch registers in fastcall, so we need to save those
 		mov SavedRegister(8), eax
 		mov SavedRegister(4), ecx
 		mov SavedRegister(0), edx

src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Document/TextAnchor.cs

@@ -16,7 +16,7 @@ namespace ICSharpCode.AvalonEdit.Document
 	/// </summary>
 	/// <remarks>
 	/// <para>Use the <see cref="Offset"/> property to get the offset from a text anchor.
-	/// Use the <see cref="TextDocument.CreateAnchor"/> to create an anchor from an offset.
+	/// Use the <see cref="TextDocument.CreateAnchor"/> method to create an anchor from an offset.
 	/// </para>
 	/// <para>
 	/// The document will automatically update all text anchors; and because it uses weak references to do so,

src/Main/Core/Test/AddInTreeTests/ExtPathTests.cs

@@ -54,12 +54,6 @@ namespace ICSharpCode.Core.Tests.AddInTreeTests.Tests
 		}
 		#endregion
 		
-		[Test]
-		public void TestCombine()
-		{
-			Assert.AreEqual(Path.Combine("A", Path.Combine("B", Path.Combine("Long", "Longer.txt"))), FileUtility.Combine("A", "B", "Long", "Longer.txt"));
-		}
-		
 		[Test]
 		public void TestIsBaseDirectory()
 		{