Skip to content

Commit

Permalink
Replace 'ido-completing-read' with 'completing-read-function'
Browse files Browse the repository at this point in the history
  • Loading branch information
markus1189 committed Feb 25, 2014
1 parent 1af6521 commit ec00623
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion haskell-mode.el
Original file line number Diff line number Diff line change
Expand Up @@ -715,7 +715,7 @@ Brings up the documentation for haskell-mode-hook."
(cond ((save-excursion (forward-word -1)
(looking-at "^import$"))
(insert " ")
(let ((module (ido-completing-read "Module: " (haskell-session-all-modules))))
(let ((module (funcall completing-read-function "Module: " (haskell-session-all-modules))))
(insert module)
(haskell-mode-format-imports)))
((not (string= "" (save-excursion (forward-char -1) (haskell-ident-at-point))))
Expand Down
4 changes: 2 additions & 2 deletions haskell-process.el
Original file line number Diff line number Diff line change
Expand Up @@ -432,7 +432,7 @@ for various things, but is optional."
"Prompts for a Cabal command to run."
(interactive)
(haskell-process-do-cabal
(ido-completing-read "Cabal command: "
(funcall completing-read-function "Cabal command: "
haskell-cabal-commands)))

(defun haskell-process-add-cabal-autogen ()
Expand Down Expand Up @@ -755,7 +755,7 @@ now."
((> (length modules) 1)
(when (y-or-n-p (format "Identifier `%s' not in scope, choose module to import?"
ident))
(ido-completing-read "Module: " modules)))
(funcall completing-read-function "Module: " modules)))
((= (length modules) 1)
(when (y-or-n-p (format "Identifier `%s' not in scope, import `%s'?"
ident
Expand Down
2 changes: 1 addition & 1 deletion haskell-session.el
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,7 @@ If DONTCREATE is non-nil don't create a new session."
(defun haskell-session-choose ()
"Find a session by choosing from a list of the current sessions."
(when haskell-sessions
(let* ((session-name (ido-completing-read
(let* ((session-name (funcall completing-read-function
"Choose Haskell session: "
(mapcar 'haskell-session-name haskell-sessions)))
(session (find-if (lambda (session)
Expand Down

0 comments on commit ec00623

Please sign in to comment.