diff --git a/misc/fuel/fuel-edit.el b/misc/fuel/fuel-edit.el index 941f57140e..f89e2b3eb8 100644 --- a/misc/fuel/fuel-edit.el +++ b/misc/fuel/fuel-edit.el @@ -65,7 +65,6 @@ ;;; Editing commands: (defvar fuel-edit--word-history nil) -(defvar fuel-edit--previous-location nil) (defun fuel-edit-vocabulary (&optional refresh vocab) "Visits vocabulary file in Emacs. @@ -129,7 +128,7 @@ was last invoked." (interactive) (condition-case nil (pop-tag-mark) - (error "No previous location for find word or vocab invokation"))) + (error "No previous location for find word or vocab invocation"))) (defvar fuel-edit--buffer-history nil) diff --git a/misc/fuel/fuel-font-lock.el b/misc/fuel/fuel-font-lock.el index 86ae94fe8a..f3b510fdd9 100644 --- a/misc/fuel/fuel-font-lock.el +++ b/misc/fuel/fuel-font-lock.el @@ -88,7 +88,6 @@ (t 'default)))) ((or (char-equal c ?U) (char-equal c ?C)) 'factor-font-lock-parsing-word) - ((char-equal c ?\() 'factor-font-lock-stack-effect) ((char-equal c ?\") 'factor-font-lock-string) (t 'factor-font-lock-comment))))) diff --git a/misc/fuel/fuel-syntax.el b/misc/fuel/fuel-syntax.el index 80bfd0afcb..67341120c1 100644 --- a/misc/fuel/fuel-syntax.el +++ b/misc/fuel/fuel-syntax.el @@ -136,7 +136,7 @@ (fuel-syntax--second-word-regex '("&:" "SYMBOL:" "VAR:"))) (defconst fuel-syntax--stack-effect-regex - "\\( ( .* )\\)\\|\\( (( .* ))\\)") + "\\( ( [^\n]* )\\)\\|\\( (( [^\n]* ))\\)") (defconst fuel-syntax--using-lines-regex "^USING: +\\([^;]+\\);") @@ -239,6 +239,8 @@ (modify-syntax-entry ?\r " " table) (modify-syntax-entry ?\ " " table) (modify-syntax-entry ?\n " " table) + (modify-syntax-entry ?\( "()" table) + (modify-syntax-entry ?\) ")(" table) table)) (defconst fuel-syntax--syntactic-keywords @@ -247,8 +249,6 @@ ;; Comments: ("\\_<\\(#?!\\) .*\\(\n\\|$\\)" (1 "<") (2 ">")) ("\\_<\\(#?!\\)\\(\n\\|$\\)" (1 "<") (2 ">")) - (" \\((\\)( \\([^\n]*\\) )\\()\\)\\( \\|\n\\)" (1 "b")) - (" \\((\\) \\([^\n]*\\) \\()\\)\\( \\|\n\\)" (1 "b")) ;; Strings ("\\( \\|^\\)\\(DLL\\|P\\|SBUF\\)\\(\"\\)\\([^\n\r\f\\\"]\\|\\\\.\\)*?\\(\"\\)" (3 "\"") (5 "\""))