From 16c067e71a1f69e601b11f0048bceb92d686cbe5 Mon Sep 17 00:00:00 2001 From: "Jose A. Ortega Ruiz" Date: Tue, 13 Jan 2009 10:29:27 +0100 Subject: [PATCH 1/2] FUEL: Bug fix. --- extra/fuel/help/help.factor | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extra/fuel/help/help.factor b/extra/fuel/help/help.factor index 298124ffb4..ff7239ac8f 100644 --- a/extra/fuel/help/help.factor +++ b/extra/fuel/help/help.factor @@ -95,7 +95,7 @@ PRIVATE> [ [ see ] with-string-writer \ $code swap 2array ] bi 3array ; inline : (fuel-word-def) ( name -- str ) - fuel-find-word [ [ def>> pprint ] with-string-writer ] when* ; inline + fuel-find-word [ [ def>> pprint ] with-string-writer ] [ f ] if* ; inline : (fuel-vocab-summary) ( name -- str ) >vocab-link summary ; inline From 7e751b4195c6279cdee4cf9dc880bed2f9fa2e50 Mon Sep 17 00:00:00 2001 From: "Jose A. Ortega Ruiz" Date: Tue, 13 Jan 2009 11:57:59 +0100 Subject: [PATCH 2/2] FUEL: Fix the fix to multiline string literals font-lock. --- misc/fuel/fuel-syntax.el | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/misc/fuel/fuel-syntax.el b/misc/fuel/fuel-syntax.el index 7f0fa313c2..b74b0afc11 100644 --- a/misc/fuel/fuel-syntax.el +++ b/misc/fuel/fuel-syntax.el @@ -94,7 +94,7 @@ "\\_<-?[0-9]+\\.[0-9]*\\([eE][+-]?[0-9]+\\)?\\_>") (defconst fuel-syntax--bad-string-regex - "\"[^\"]*$") + "\"\\([^\"]\\|\\\\\"\\)*\n") (defconst fuel-syntax--word-definition-regex (fuel-syntax--second-word-regex @@ -226,7 +226,7 @@ ;; CHARs: ("CHAR: \\(.\\)\\( \\|$\\)" (1 "w")) ;; Strings - ("\\(\"\\)[^\n\r\f]*\\(\"\\)" (1 "\"") (2 "\"")) + ("\\(\"\\)\\([^\n\r\f\\\"]\\|\\\\\"?\\)*\\(\"\\)" (1 "\"") (3 "\"")) ;; Let and lambda: ("\\_<\\(!(\\) .* \\()\\)" (1 "<") (2 ">")) ("\\(\\[\\)\\(let\\|wlet\\|let\\*\\)\\( \\|$\\)" (1 "(]"))