Fixed customized syntax highlightings.

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

@@ -136,7 +136,7 @@ namespace ICSharpCode.AvalonEdit.AddIn
 			isLoading = true;
 			try {
 				BookmarksDetach();
-				codeEditor.PrimaryTextEditor.SyntaxHighlighting =
+				codeEditor.SyntaxHighlighting =
 					HighlightingManager.Instance.GetDefinitionByExtension(Path.GetExtension(file.FileName));
 				
 				if (!file.IsUntitled) {

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

@@ -83,6 +83,9 @@ namespace ICSharpCode.AvalonEdit.AddIn
 			foreach (CustomizedHighlightingColor color in customizations) {
 				if (color.Name == BracketHighlight) {
 					renderer.UpdateColors(color.Background ?? Colors.Blue, color.Foreground ?? Colors.Blue);
+					// 'break;' is necessary because more specific customizations come first in the list
+					// (language-specific customizations are first, followed by 'all languages' customizations)
+					break;
 				}
 			}
 		}

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

@@ -314,6 +314,7 @@ namespace ICSharpCode.AvalonEdit.AddIn
 				secondaryTextEditor.SetBinding(TextEditor.IsReadOnlyProperty,
 				                               new Binding(TextEditor.IsReadOnlyProperty.Name) { Source = primaryTextEditor });
 				secondaryTextEditor.SyntaxHighlighting = primaryTextEditor.SyntaxHighlighting;
+				secondaryTextEditor.UpdateCustomizedHighlighting();
 				
 				gridSplitter = new GridSplitter {
 					Height = 4,

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

@@ -35,6 +35,9 @@ namespace ICSharpCode.AvalonEdit.AddIn
 			textEditor.TextArea.ClearValue(TextArea.SelectionForegroundProperty);
 			textEditor.TextArea.TextView.ClearValue(TextView.NonPrintableCharacterBrushProperty);
 			
+			// 'assigned' flags are used so that the first matching customization wins.
+			// This is necessary because more specific customizations come first in the list
+			// (language-specific customizations are first, followed by 'all languages' customizations)
 			bool assignedDefaultText = false;
 			bool assignedSelectedText = false;
 			bool assignedNonPrintableCharacter = false;

src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/Options/CustomizedHighlightingItem.cs

@@ -1,6 +1,6 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
+// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
-// This code is distributed under the GNU LGPL (for details please see \doc\license.txt)
+// This code is distributed under the GNU LGPL (for details please see \doc\license.txt)
-
+
 using System;
 using System.Collections.Generic;
 using System.Windows.Media;
@@ -191,6 +191,7 @@ namespace ICSharpCode.AvalonEdit.AddIn.Options
 		
 		public override string ToString()
 		{
-			return this.Name;
		}
+			return this.Name;
+		}
 	}
-}
+}