FUEL: ensures fuel-listener-mode and factor-mode has the same syntax table

diff --git a/misc/fuel/factor-mode.el b/misc/fuel/factor-mode.el
index 1c3b0e01588b83798dea595c33aabbf3478763f2..52374c3fc786b34a826a42de64f3b8573a1c0b25 100644 (file)
--- a/misc/fuel/factor-mode.el
+++ b/misc/fuel/factor-mode.el
@@ -704,43 +704,7 @@ With prefix, non-existing files will be created."
 \f
 ;;; factor-mode:
 
-;; I think it is correct to put almost all punctuation characters in
-;; the word class because Factor words can be made up of almost
-;; anything. Otherwise you get incredibly annoying regexps.
-(defvar factor-mode-syntax-table
-  (let ((table (make-syntax-table prog-mode-syntax-table)))
-    (modify-syntax-entry ?\" "\"" table)
-    (modify-syntax-entry ?# "_" table)
-    (modify-syntax-entry ?! "_" table)
-    (modify-syntax-entry ?\n ">   " table)
-    (modify-syntax-entry ?$ "_" table)
-    (modify-syntax-entry ?@ "_" table)
-    (modify-syntax-entry ?? "_" table)
-    (modify-syntax-entry ?_ "_" table)
-    (modify-syntax-entry ?: "_" table)
-    (modify-syntax-entry ?< "_" table)
-    (modify-syntax-entry ?> "_" table)
-    (modify-syntax-entry ?. "_" table)
-    (modify-syntax-entry ?, "_" table)
-    (modify-syntax-entry ?& "_" table)
-    (modify-syntax-entry ?| "_" table)
-    (modify-syntax-entry ?% "_" table)
-    (modify-syntax-entry ?= "_" table)
-    (modify-syntax-entry ?/ "_" table)
-    (modify-syntax-entry ?+ "_" table)
-    (modify-syntax-entry ?* "_" table)
-    (modify-syntax-entry ?- "_" table)
-    (modify-syntax-entry ?\; "_" table)
-    (modify-syntax-entry ?\' "_" table)
-    (modify-syntax-entry ?^ "_" table)
-    (modify-syntax-entry ?~ "_" table)
-    (modify-syntax-entry ?\( "()" table)
-    (modify-syntax-entry ?\) ")(" table)
-    (modify-syntax-entry ?\{ "(}" table)
-    (modify-syntax-entry ?\} "){" table)
-    (modify-syntax-entry ?\[ "(]" table)
-    (modify-syntax-entry ?\] ")[" table)
-    table))
+(defvar factor-mode-syntax-table (fuel-syntax-table))
 
 (defun factor-setup-buffer-font-lock ()
   (setq-local comment-start "! ")

diff --git a/misc/fuel/fuel-base.el b/misc/fuel/fuel-base.el
index 841f5869f336e5348314a8a30aa9026b1ccf8513..8044b11102282df713949053e74a3b872ed84f7a 100644 (file)
--- a/misc/fuel/fuel-base.el
+++ b/misc/fuel/fuel-base.el
@@ -80,7 +80,44 @@
       (save-buffer buffer))
     (cons file buffer)))
 
-\f
+;; I think it is correct to put almost all punctuation characters in
+;; the word class because Factor words can be made up of almost
+;; anything. Otherwise you get incredibly annoying regexps.
+(defun fuel-syntax-table ()
+    (let ((table (make-syntax-table prog-mode-syntax-table)))
+    (modify-syntax-entry ?\" "\"" table)
+    (modify-syntax-entry ?# "_" table)
+    (modify-syntax-entry ?! "_" table)
+    (modify-syntax-entry ?\n ">   " table)
+    (modify-syntax-entry ?$ "_" table)
+    (modify-syntax-entry ?@ "_" table)
+    (modify-syntax-entry ?? "_" table)
+    (modify-syntax-entry ?_ "_" table)
+    (modify-syntax-entry ?: "_" table)
+    (modify-syntax-entry ?< "_" table)
+    (modify-syntax-entry ?> "_" table)
+    (modify-syntax-entry ?. "_" table)
+    (modify-syntax-entry ?, "_" table)
+    (modify-syntax-entry ?& "_" table)
+    (modify-syntax-entry ?| "_" table)
+    (modify-syntax-entry ?% "_" table)
+    (modify-syntax-entry ?= "_" table)
+    (modify-syntax-entry ?/ "_" table)
+    (modify-syntax-entry ?+ "_" table)
+    (modify-syntax-entry ?* "_" table)
+    (modify-syntax-entry ?- "_" table)
+    (modify-syntax-entry ?\; "_" table)
+    (modify-syntax-entry ?\' "_" table)
+    (modify-syntax-entry ?^ "_" table)
+    (modify-syntax-entry ?~ "_" table)
+    (modify-syntax-entry ?\( "()" table)
+    (modify-syntax-entry ?\) ")(" table)
+    (modify-syntax-entry ?\{ "(}" table)
+    (modify-syntax-entry ?\} "){" table)
+    (modify-syntax-entry ?\[ "(]" table)
+    (modify-syntax-entry ?\] ")[" table)
+    table))
+
 (provide 'fuel-base)
 
 ;;; fuel-base.el ends here

diff --git a/misc/fuel/fuel-listener.el b/misc/fuel/fuel-listener.el
index 2d1b182a7508817061b816e787457518c323853d..2339b623f8dc0d527858637fcf9a0bdca4ff23ab 100644 (file)
--- a/misc/fuel/fuel-listener.el
+++ b/misc/fuel/fuel-listener.el
@@ -266,7 +266,8 @@ the vocabulary name."
   (setq-local comint-use-prompt-regexp nil)
   (setq-local comint-prompt-read-only fuel-listener-prompt-read-only-p)
   (fuel-listener--setup-completion)
-  (fuel-listener--setup-stack-mode))
+  (fuel-listener--setup-stack-mode)
+  (set-syntax-table (fuel-syntax-table)))
 
 (define-key fuel-listener-mode-map "\C-a" 'fuel-listener--bol)