[nongnu] elpa/haskell-tng-mode ea46850 207/385: bugfix for compile vs runtime loading

[ELPA Syncer]

branch: elpa/haskell-tng-mode
commit ea4685006de08491a93ec1526482ae7d1038f6e7
Author: Tseen She <ts33n.sh3@gmail.com>
Commit: Tseen She <ts33n.sh3@gmail.com>

    bugfix for compile vs runtime loading
---
 haskell-tng-contrib.el        | 8 ++++++--
 haskell-tng-util.el           | 6 ------
 test/haskell-tng-testutils.el | 5 +++--
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/haskell-tng-contrib.el b/haskell-tng-contrib.el
index 681b088..8976251 100644
--- a/haskell-tng-contrib.el
+++ b/haskell-tng-contrib.el
@@ -42,12 +42,15 @@
 
 ;;;###autoload
 (progn
+  ;; TODO split into separate files that require their dependency
+
   (when (boundp yas-minor-mode)
     (add-to-list
      'yas-snippet-dirs
      (expand-file-name
       "snippets"
-      (haskell-tng--util-this-lisp-directory)))
+      (when load-file-name
+        (file-name-directory load-file-name))))
     (yas-reload-all nil t))
 
   (when (fboundp 'sp-local-pair)
@@ -60,9 +63,10 @@
                      :post-handlers '(("| " "SPC")))))
 
   (add-hook
-   'haskell-tng-mode
+   'haskell-tng-mode-hook
    (lambda ()
      (when (boundp projectile-mode)
+       ;; TODO fix the haskell-stack detection to also include cabal
        (setq-local projectile-tags-command "fast-tags -Re 
--exclude=dist-newstyle .")))
 
    ))
diff --git a/haskell-tng-util.el b/haskell-tng-util.el
index b8fad4c..4155bd7 100644
--- a/haskell-tng-util.el
+++ b/haskell-tng-util.el
@@ -71,11 +71,5 @@ and taking a regexp."
        (while (not (setq ,res ,test)) ,@body)
        ,res)))
 
-(defmacro haskell-tng--util-this-lisp-directory ()
-  (expand-file-name
-   (if load-file-name
-       (file-name-directory load-file-name)
-     default-directory)))
-
 (provide 'haskell-tng-util)
 ;;; haskell-tng-util.el ends here
diff --git a/test/haskell-tng-testutils.el b/test/haskell-tng-testutils.el
index 6d16a44..7bb5994 100644
--- a/test/haskell-tng-testutils.el
+++ b/test/haskell-tng-testutils.el
@@ -38,10 +38,11 @@ Alternatively, if MODE is a buffer object, run TO-STRING 
there instead."
           (write-region got nil golden)
           nil))))
 
-(defun testdata (file)
+(defmacro testdata (file)
   (expand-file-name
    file
-   (haskell-tng--util-this-lisp-directory)))
+   (when load-file-name
+     (file-name-directory load-file-name))))
 
 (defun is-comment-at-point ()
   ;; this could be sped up by storing all comment regions in an alist