--- JvUnicodeHLEditor.pas	Thu Aug 18 11:52:44 2005
+++ 3.0\JvUnicodeHLEditor.pas	Thu Feb 24 13:26:12 2005
@@ -255,10 +255,8 @@
     case FHighlighter of
       hlPascal:
         Parser.Style := psPascal;
-      hlCBuilder, hlJava, hlNQC, hlCSharp:
+      hlCBuilder, hlSql, hlJava, hlNQC, hlCSharp:
         Parser.Style := psCpp;
-      hlSql:
-        Parser.Style := psSql;
       hlPython:
         Parser.Style := psPython;
       hlVB:
@@ -323,7 +321,6 @@
     ' int monitor repeat return signed start stop sub switch task true' +
     ' until void while ';
 
-  (* 18/08 - Eswar: Support for REPLACE keyword *)
   SQLKeyWords =
     ' active as add asc after ascending all at alter auto' +
     ' and autoddl any avg based between basename blob' +
@@ -349,7 +346,7 @@
     ' open output_type option overflow page post_event pagelength  precision' +
     ' pages  prepare page_size procedure parameter  protected password  primary' +
     ' plan  privileges position  public quit' +
-    ' raw_partitions  retain rdb db_key  return read replace returning_values real  returns' +
+    ' raw_partitions  retain rdb db_key  return read  returning_values real  returns' +
     ' record_version revoke references  right release  rollback reserv runtime' +
     ' reserving schema  sql segment  sqlcode select  sqlerror set  sqlwarning' +
     ' shadow  stability shared  starting shell  starts show  statement' +
@@ -583,17 +580,9 @@
         Result := ((LS > 0) and (St[1] = '{')) or
           ((LS > 1) and (((St[1] = '(') and (St[2] = '*')) or
           ((St[1] = '/') and (St[2] = '/'))));
-      hlCBuilder, hlJava, hlPhp, hlNQC:
+      hlCBuilder, hlSql, hlJava, hlPhp, hlNQC:
         Result := (LS > 1) and (St[1] = '/') and
           ((St[2] = '*') or (St[2] = '/'));
-      (* 17/08 - Eswar: Support for SQL comment line beginning with -- *)
-      hlSql:
-        Result := (LS > 1) and ((St[1] = '-') and
-          (St[2] = '-'));
-      (* 17/08 - Eswar: HTML multi line comment support *)
-      hlHtml:
-        Result := (LS > 3) and (St[1] = '<') and (St[2] = '!')
-          and (St[3] = '-') and (St[4] = '-');
       hlVB:
         Result := (LS > 0) and (St[1] = '''');
       hlPython, hlPerl:
@@ -802,7 +791,7 @@
       C := Colors.Comment
     else
       C := Colors.PlainText;
-    if (FLong <> 0) {18/08 - Eswar: and (FHighlighter <> hlHtml)} then
+    if (FLong <> 0) and (FHighlighter <> hlHtml) then
     begin
       Parser.pcPos := Parser.pcProgram + FindLongEnd + 1;
       case Highlighter of
@@ -932,34 +921,15 @@
           hlHtml:
             if not InTag then
             begin
-              (* 18/08 - Eswar: Check for the comment starting
-                 with <!-- and force the hilighter to check for
-                 the comments *)
-              if Token = '<!--' then
-              begin
-                InTag := True;
-                SetColor(Colors.Comment);
-                F := False;
-              end
-              else
               if Token = '<' then
               begin
                 InTag := True;
-                SetColor(Colors.Reserved);
-                F := True;
-              end
-              else
-                F := False;
+                SetColor(Colors.Reserved)
+              end;
+              F := True;
             end
             else
             begin
-              if Token = '-->' then
-              begin
-                InTag := False;
-                SetColor(Colors.Reserved);
-                F := False;
-              end
-              else
               if Token = '>' then
               begin
                 InTag := False;
@@ -1368,29 +1338,13 @@
                       P := StrScanW(F + I, WideChar('>'));
                       if P = nil then
                       begin
-                        (* 17/08 - Eswar: Multiline comments in HTML *)
-                        if S[2] = '!' then
-                          FLong := lgComment1
-                        else
-                          FLong := lgTag;
-                          
+                        FLong := lgTag;
                         Break;
                       end
                       else
                         I := P - F + 1;
                     end;
                 end;
-              (* 17/08 - Eswar: Multiline comments in HTML *)
-              lgComment1:
-                begin
-                  P := StrScanW(F + I - 1, WideChar('>'));
-                  if P = nil then
-                    Break
-                  else
-                    if (P[-2] = '-') and (P[-1] = '-') then
-                      FLong := lgNone;
-                  I := P - F + 1;
-                end;
               lgTag: // html tag
                 begin
                   P := StrScanW(F + I - 1, WideChar('>'));
@@ -1591,16 +1545,6 @@
       end;
     hlHtml:
       case FLong of
-        (* 18/08 - Eswar: HTML multiline comments *)
-        lgComment1:
-          begin
-            P := StrScanW(P, WideChar('>'));
-            if P <> nil then
-              // check if the previous characters are
-              // --
-              if (P[-1] = '-') and (P[-2] = '-') then
-                Result := P - PWideChar(FLine);
-          end;
         lgTag:
           begin
             P := StrScanW(P, WideChar('>'));