FUEL: use factor.com instead of factor.exe as default binary under Windows.

diff --git a/misc/fuel/fuel-connection.el b/misc/fuel/fuel-connection.el
index 14c4d0b36f8e1219858333eb01c098494ee9a137..f180d0f2b430beff7890475c69ff0159a51bb530 100644 (file)
--- a/misc/fuel/fuel-connection.el
+++ b/misc/fuel/fuel-connection.el
@@ -144,8 +144,12 @@
   (add-hook 'comint-redirect-hook
             'fuel-con--comint-redirect-hook nil t))
 
-(defadvice comint-redirect-setup (after fuel-con--advice activate)
-  (setq comint-redirect-finished-regexp fuel-con--comint-finished-regex))
+(defadvice comint-redirect-setup
+  (after fuel-con--advice (output-buffer comint-buffer finished-regexp &optional echo))
+  (with-current-buffer comint-buffer
+    (when fuel-con--connection
+      (setq comint-redirect-finished-regexp fuel-con--comint-finished-regex))))
+(ad-activate 'comint-redirect-setup)
 
 (defun fuel-con--comint-preoutput-filter (str)
   (when (string-match fuel-con--comint-finished-regex str)

diff --git a/misc/fuel/fuel-listener.el b/misc/fuel/fuel-listener.el
index d0898de04f78b7d986fd7a4fe7d439a90f6701bd..b8bf4d4b7f9a5465fa5b205c6bb5e4893f57f4b5 100644 (file)
--- a/misc/fuel/fuel-listener.el
+++ b/misc/fuel/fuel-listener.el
@@ -32,7 +32,7 @@
 
 (defcustom fuel-listener-factor-binary
   (expand-file-name (cond ((eq system-type 'windows-nt)
-                           "factor.exe")
+                           "factor.com")
                           ((eq system-type 'darwin)
                            "Factor.app/Contents/MacOS/factor")
                           (t "factor"))