فهرست منبع

Merge branch 'main' into isscint-update

# Conflicts:
#	whatsnew.htm
Martijn Laan 1 سال پیش
والد
کامیت
3c31d5bf98
2فایلهای تغییر یافته به همراه8 افزوده شده و 6 حذف شده
  1. 7 5
      Components/ScintEdit.pas
  2. 1 1
      whatsnew.htm

+ 7 - 5
Components/ScintEdit.pas

@@ -1820,12 +1820,14 @@ begin
   SetStyleAttr(STYLE_DEFAULT, DefaultAttr, True);
   Call(SCI_STYLECLEARALL, 0, 0);
 
-  if Assigned(FStyler) and FUseStyleAttributes then begin
-    for I := 0 to 31 do
-      SetStyleAttrFromStyler(I);
+  if Assigned(FStyler) then begin
+    if  FUseStyleAttributes then begin
+      for I := 0 to 31 do
+        SetStyleAttrFromStyler(I);
+      SetStyleAttrFromStyler(STYLE_BRACELIGHT);
+      SetStyleAttrFromStyler(STYLE_INDENTGUIDE);
+    end;
     SetStyleAttrFromStyler(STYLE_LINENUMBER);
-    SetStyleAttrFromStyler(STYLE_BRACELIGHT);
-    SetStyleAttrFromStyler(STYLE_INDENTGUIDE);
   end;
 
   if AutoCompleteFontName <> '' then

+ 1 - 1
whatsnew.htm

@@ -42,7 +42,7 @@ For conditions of distribution and use, see <a href="files/is/license.txt">LICEN
   <li>.</li>
 </ul>
 
-<p><a name="6.3.0"></a><span class="ver">6.3.0-dev </span><span class="date">(?)</span></p>
+<p><a name="6.3.0"></a><span class="ver">6.3.0 </span><span class="date">(2024-06-09)</span></p>
 <p><span class="head2">Support for UTF-8 encoded files improved</span></p>
 <ul>
   <li>Added support for UTF-8 encoded files without a BOM for .iss script files, .isl messages files, <tt>LicenseFile</tt>, <tt>InfoBeforeFile</tt>,  <tt>InfoAfterFile</tt>, and ISPP's <tt>#file</tt>.</li>