Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix to work with pulp and repl-toggle.el #24

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix to work with pulp and repl-toggle.el #24

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
779b03f
Make psci argument optional so repl-toggle works
vapniks Apr 22, 2019
a3ab427
dont use extra-sources when using pulp
vapniks Apr 23, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions psci.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@
(require 'comint)
(require 'dash)
(require 'purescript-font-lock)
(require 'cl-lib)

;; constants or variables

Expand Down Expand Up @@ -133,7 +134,7 @@ Otherwise, just return PATH."
;; public functions

;;;###autoload
(defun psci (project-root-folder)
(cl-defun psci (&optional (project-root-folder (psci--project-root!)))
"Run an inferior instance of \"psci\" inside Emacs, in PROJECT-ROOT-FOLDER.
If not supplied, the root folder will be guessed using
`projectile-project-root' (if available), otherwise it will
Expand All @@ -142,7 +143,8 @@ default to the current buffer's directory."
(psci--project-root!))))
(let* ((default-directory project-root-folder)
(psci-program psci/purs-path)
(extra-sources (psci--get-psc-package-sources!))
(extra-sources (unless (string-match "pulp" psci-program)
(psci--get-psc-package-sources!))
(buffer (comint-check-proc psci/buffer-name)))
;; pop to the "*psci*" buffer if the process is dead, the
;; buffer is missing or it's got the wrong mode.
Expand Down