From dceae3df93ccaecb84f67d17444acd756933a2d6 Mon Sep 17 00:00:00 2001 From: "Jose A. Ortega Ruiz" Date: Tue, 27 Jan 2009 23:15:08 +0100 Subject: [PATCH] FUEL: Better handling of scaped characters inside strings. --- misc/fuel/fuel-syntax.el | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/misc/fuel/fuel-syntax.el b/misc/fuel/fuel-syntax.el index 7f3e0c46f5..ad5a025a88 100644 --- a/misc/fuel/fuel-syntax.el +++ b/misc/fuel/fuel-syntax.el @@ -233,16 +233,11 @@ ;; Default is word constituent (dotimes (i 256) (modify-syntax-entry i "w" table)) - ;; Whitespace (TAB is not whitespace) (modify-syntax-entry ?\f " " table) (modify-syntax-entry ?\r " " table) (modify-syntax-entry ?\ " " table) (modify-syntax-entry ?\n " " table) - - ;; Char quote - (modify-syntax-entry ?\\ "/" table) - table)) (defconst fuel-syntax--syntactic-keywords @@ -254,9 +249,9 @@ (" \\((\\)( \\([^\n]*\\) )\\()\\)\\( \\|\n\\)" (1 "b")) (" \\((\\) \\([^\n]*\\) \\()\\)\\( \\|\n\\)" (1 "b")) ;; Strings - ("\\( \\|^\\)\\(DLL\\|P\\|SBUF\\)\\(\"\\)[^\n\r\f]*?\\(\"\\)\\( \\|\n\\)" - (3 "\"") (4 "\"")) - ("\\(\"\\)[^\n\r\f]*?\\(\"\\)\\( \\|\n\\|$\\)" (1 "\"") (2 "\"")) + ("\\( \\|^\\)\\(DLL\\|P\\|SBUF\\)\\(\"\\)\\([^\n\r\f\\\"]\\|\\\\.\\)*?\\(\"\\)" + (3 "\"") (5 "\"")) + ("\\(\"\\)\\([^\n\r\f\\\"]\\|\\\\.\\)*?\\(\"\\)" (1 "\"") (3 "\"")) ("\\_<<\\(\"\\)\\_>" (1 "\\_>" (1 ">b")) ;; Multiline constructs