From 923bd07ad45c3958c7eac35d252e752c65d2901a Mon Sep 17 00:00:00 2001 From: "Jose A. Ortega Ruiz" Date: Sat, 17 Jan 2009 05:35:16 +0100 Subject: [PATCH 1/2] FUEL: Kind of subtle bug in C-cC-eu caused by syntax table tweakings. --- misc/fuel/fuel-debug-uses.el | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/misc/fuel/fuel-debug-uses.el b/misc/fuel/fuel-debug-uses.el index af4f2ae60b..4842f960d1 100644 --- a/misc/fuel/fuel-debug-uses.el +++ b/misc/fuel/fuel-debug-uses.el @@ -47,7 +47,8 @@ (substring-no-properties (thing-at-point 'line))))) (when in-usings (setq line (concat "! " line))) (push line lines)) - (when (and in-usings (looking-at ".*\\_<;\\_>")) (setq in-usings nil)) + (when (and in-usings (looking-at "\\(^\\|.* \\);\\( \\|\n\\)")) + (setq in-usings nil)) (forward-line)) (reverse lines)))))) From c9829a1c089bf218764158ae9b7de36a5b593f1f Mon Sep 17 00:00:00 2001 From: "Jose A. Ortega Ruiz" Date: Sat, 17 Jan 2009 23:11:00 +0100 Subject: [PATCH 2/2] FUEL: Better font lock for empty USING: ; form (semicolon as parsing word). --- misc/fuel/fuel-font-lock.el | 2 ++ misc/fuel/fuel-syntax.el | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/misc/fuel/fuel-font-lock.el b/misc/fuel/fuel-font-lock.el index 4b5520b8f9..fe20024fcd 100644 --- a/misc/fuel/fuel-font-lock.el +++ b/misc/fuel/fuel-font-lock.el @@ -82,6 +82,8 @@ ((looking-at "\\(TUPLE\\|SYMBOLS\\|VARS\\): ") 'factor-font-lock-symbol) (t 'default)))) + ((char-equal (char-after (nth 8 state)) ?U) + 'factor-font-lock-parsing-word) (t 'factor-font-lock-comment))) (defconst fuel-font-lock--font-lock-keywords diff --git a/misc/fuel/fuel-syntax.el b/misc/fuel/fuel-syntax.el index ca247cf8f0..8d2948af58 100644 --- a/misc/fuel/fuel-syntax.el +++ b/misc/fuel/fuel-syntax.el @@ -249,10 +249,10 @@ ("\\_<<\\(\"\\)\\_>" (1 "\"")) ("\\_<\\(\"\\)>\\_>" (1 "\"")) ;; Multiline constructs - ("\\_b")) + ("\\_<\\(U\\)SING: \\(;\\)" (1 "b")) ("\\_\\)" (2 "\\)" (2 "" (1 ">b")) ;; Let and lambda: ("\\_<\\(!(\\) .* \\()\\)" (1 "<") (2 ">"))