Merge branch 'master' into new_ui

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))))))
 

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

misc/fuel/fuel-syntax.el

@@ -249,10 +249,10 @@
     ("\\_<<\\(\"\\)\\_>" (1 "\""))
     ("\\_<\\(\"\\)>\\_>" (1 "\""))
     ;; Multiline constructs
-    ("\\_<USING:\\( \\)\\(;\\)" (1 "<b") (2 ">b"))
+    ("\\_<\\(U\\)SING: \\(;\\)" (1 "<b") (2 ">b"))
     ("\\_<USING:\\( \\)" (1 "<b"))
     ("\\_<TUPLE: +\\w+? +< +\\w+? *\\( \\)" (1 "<b"))
-    ("\\_<\\(TUPLE\\|SYMBOLS\\|VARS\\): +\\w+? *\\( \\)\\([^<]\\|\\_>\\)" (2 "<b"))
+    ("\\_<\\(TUPLE\\|SYMBOLS\\|VARS\\): +\\w+? *\\( \\)\\([^<\n]\\|\\_>\\)" (2 "<b"))
     ("\\(\n\\| \\);\\_>" (1 ">b"))
     ;; Let and lambda:
     ("\\_<\\(!(\\) .* \\()\\)" (1 "<") (2 ">"))