Fix syntax sameness comparison

CHANGELOG.md

@@ -2,12 +2,13 @@
 Change Log
 ==========================
 
-2.5.4 (126)
+2.5.4 (127)
 --------------------------
 
 ### Fixes
 
 - Fix an issue where application didn't work on Mavericks and earlier.
+- Fix an issue where syntax was occasionally parsed wtice on window restoration.
 
 
 

CotEditor/CotEditor.help/Contents/Resources/en.lproj/pgs/releasenotes.html

@@ -34,6 +34,7 @@
 
 <ul>
 	<li>Fix an issue where application didn't work on Mavericks and earlier.</li>
+	<li>Fix an issue where syntax was occasionally parsed wtice on window restoration.</li>
 </ul>
 </section>
 </article>

CotEditor/CotEditor.help/Contents/Resources/ja.lproj/pgs/releasenotes.html

@@ -34,6 +34,7 @@
 
 <ul>
 	<li>Mavericks 以前でアプリケーションが機能しない不具合を修正</li>
+	<li>ウインドウ復帰時に稀にシンタックスが2度解析されることがあった不具合を修正</li>
 </ul>
 </section>
 </article>

CotEditor/Sources/CESyntaxStyle.m

@@ -251,8 +251,10 @@ static NSArray<NSString *> *kSyntaxDictKeys;
 {
     if ([[syntaxStyle styleName] isEqualToString:[self styleName]] &&
         [[syntaxStyle highlightDictionary] isEqualToDictionary:[self highlightDictionary]] &&
-        [[syntaxStyle inlineCommentDelimiter] isEqualToString:[self inlineCommentDelimiter]] &&
-        [[syntaxStyle blockCommentDelimiters] isEqualToDictionary:[self blockCommentDelimiters]])
+        ((![syntaxStyle inlineCommentDelimiter] && ![self inlineCommentDelimiter]) ||
+         [[syntaxStyle inlineCommentDelimiter] isEqualToString:[self inlineCommentDelimiter]]) &&
+        ((![syntaxStyle blockCommentDelimiters] && ![self blockCommentDelimiters]) ||
+         [[syntaxStyle blockCommentDelimiters] isEqualToDictionary:[self blockCommentDelimiters]]))
     {
         return YES;
     }