change string and comment hilight regex.

mitchan0321 · Aug 4, 2024 · 4580f5b · 4580f5b
1 parent e45fb6e
commit 4580f5b
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 9 deletions.
diff --git a/lib/Mode-C.key b/lib/Mode-C.key
@@ -13,10 +13,6 @@ sets HILIGHT_REGEXP (
    '\b[Nn][Uu][Ll][Ll]\b|<t>|<nil>|\b[Tt][Rr][Uu][Ee]\b|\b[Ff][Aa][Ll][Ss][Ee]\b|\b[0-9]+\b|\b0x[0-9a-fA-F]+\b'
    VALUE_LITERAL_HILIGHT
   )
-  (
-   '//.*$'
-   COMMENT_HILIGHT
-  )
 );
 
 sets HILIGHT_REGEXP_ML (
@@ -25,7 +21,7 @@ sets HILIGHT_REGEXP_ML (
    STRING_LITERAL_HILIGHT
   )
   (
-   '/\*/?([^/]|[^*]/)*\*/'
+   '/\*/?([^/]|[^*]/)*\*/|//.*\n'
    COMMENT_HILIGHT
   )
 );

diff --git a/lib/Mode-Grep.key b/lib/Mode-Grep.key
@@ -1,3 +1,3 @@
-sets HILIGHT_REGEXP    [setvar HILIGHT_REGEXP_DEFAULT];
+sets HILIGHT_REGEXP    $HILIGHT_REGEXP_DEFAULT;
 sets HILIGHT_REGEXP_ML ();
 
diff --git a/lib/Mode-Prfm.key b/lib/Mode-Prfm.key
@@ -1,5 +1,16 @@
-sets HILIGHT_REGEXP    [setvar HILIGHT_REGEXP_DEFAULT];
-sets HILIGHT_REGEXP_ML [setvar HILIGHT_REGEXP_DEFAULT_ML];
+sets HILIGHT_REGEXP    $HILIGHT_REGEXP_DEFAULT;
+sets HILIGHT_REGEXP_ML 
+(
+  (
+   '(?:\\"(?:[^\\\\"]|\\\\(?:.|\n))*\\")|(?:\'(?:[^\\\\\']|\\\\(?:.|\n))*\')'
+   STRING_LITERAL_HILIGHT
+  )
+  #(
+  # '#[^"\']*[\n\r]|#.*$'
+  # COMMENT_HILIGHT
+  #)
+);
+
 setkey CTRL_J		eval-region;
 setkey CTRL_I		smart-indent;
 setkey CTRL_M		smart-newline;

diff --git a/lib/pmacs.conf b/lib/pmacs.conf
@@ -284,7 +284,8 @@ setconf HILIGHT_REGEXP_DEFAULT
    NORMAL_TEXT
   )
   (
-   '#[^"\']*$|^[\t ]*#.*$'
+   '#[^"\']*\n|#.*$'
+   # '#[^"\']*$|^[\t ]*#.*$'
    COMMENT_HILIGHT
   )
 )