branch: elpa/haskell-tng-mode
commit 356f27b892e6384f6c5f2b990be59700b05285dd
Author: Tseen She <ts33n....@gmail.com>
Commit: Tseen She <ts33n....@gmail.com>
more stable hsinspect calls
---
haskell-tng-font-lock.el | 2 +-
haskell-tng-hsinspect.el | 4 +---
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/haskell-tng-font-lock.el b/haskell-tng-font-lock.el
index 9702744..cfa17c6 100644
--- a/haskell-tng-font-lock.el
+++ b/haskell-tng-font-lock.el
@@ -80,7 +80,7 @@
(consym haskell-tng--rx-consym)
(qual haskell-tng--rx-qual)
(bigspace `(| space ,haskell-tng--rx-newline)))
- `((,(rx bol "#" (* nonl) eol)
+ `((,(rx bol "#" (* nonl) eol) ;; TODO doesn't work for "#include 'c'"
(0 'haskell-tng-cpp-face)) ;; CPP
;; reservedid / reservedop
diff --git a/haskell-tng-hsinspect.el b/haskell-tng-hsinspect.el
index 4e3dca7..755c2ff 100644
--- a/haskell-tng-hsinspect.el
+++ b/haskell-tng-hsinspect.el
@@ -83,9 +83,7 @@ t means the process failed.")
(setq haskell-tng--hsinspect-imports t) ;; avoid races
(ignore-errors (kill-buffer "*hsinspect*"))
(when-let ((ghcflags (haskell-tng--hsinspect-ghcflags))
- ;; default-directory is so that relative paths in ghcflags work
- (default-directory (haskell-tng--util-locate-dominating-file
- haskell-tng--compile-dominating-package)))
+ (default-directory (locate-dominating-file default-directory
".ghc.version")))
(if (/= 0
(let ((process-environment (cons "GHC_ENVIRONMENT=-"
process-environment)))
(apply
