Use `haskell-complete-module' for module completions

@hvr check this out!
jwiegley · Jun 6, 2014 · 5985f84 · 5985f84
1 parent e49c0e5
commit 5985f84
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/haskell-mode.el b/haskell-mode.el
@@ -128,6 +128,7 @@
 (require 'compile)
 (require 'flymake)
 (require 'outline)
+(require 'haskell-complete-module)
 (require 'haskell-compat)
 (require 'haskell-align-imports)
 (require 'haskell-sort-imports)
@@ -766,7 +767,7 @@ Brings up the documentation for haskell-mode-hook."
     (cond ((save-excursion (forward-word -1)
                            (looking-at "^import$"))
            (insert " ")
-           (let ((module (funcall haskell-completing-read-function "Module: " (haskell-session-all-modules))))
+           (let ((module (haskell-complete-module-read "Module: " (haskell-session-all-modules))))
              (insert module)
              (haskell-mode-format-imports)))
           ((not (string= "" (save-excursion (forward-char -1) (haskell-ident-at-point))))

diff --git a/haskell-process.el b/haskell-process.el
@@ -27,6 +27,7 @@
 
 ;;; Code:
 
+(require 'haskell-complete-module)
 (require 'haskell-mode)
 (require 'haskell-session)
 (require 'haskell-compat)
@@ -817,7 +818,7 @@ now."
            ((> (length modules) 1)
             (when (y-or-n-p (format "Identifier `%s' not in scope, choose module to import?"
                                     ident))
-              (funcall haskell-completing-read-function "Module: " modules)))
+              (haskell-complete-module-read "Module: " modules)))
            ((= (length modules) 1)
             (let ((module (car modules)))
               (unless (member module suggested-already)