Skip to content

Commit 00f22bd

Browse files
committed
Resolve directories to full path in session config (refs #117).
1 parent 7cede0f commit 00f22bd

File tree

2 files changed

+10
-7
lines changed

2 files changed

+10
-7
lines changed

haskell-cabal.el

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -160,10 +160,11 @@
160160
and indeed just prompting the user. Do them all."
161161
(let* ((file (haskell-cabal-find-file))
162162
(dir (when file (file-name-directory file))))
163-
(read-directory-name
164-
(format "Cabal dir%s: " (if file (format " (%s)" (file-relative-name file)) ""))
165-
nil
166-
(or dir default-directory))))
163+
(file-truename
164+
(read-directory-name
165+
(format "Cabal dir%s: " (if file (format " (%s)" (file-relative-name file)) ""))
166+
nil
167+
(or dir default-directory)))))
167168

168169
(defun haskell-cabal-compute-checksum (cabal-dir)
169170
"Computes a checksum of the .cabal configuration files."

haskell-session.el

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -228,12 +228,14 @@
228228

229229
(defun haskell-session-set-cabal-dir (s v)
230230
"Set the session cabal-dir."
231-
(haskell-session-set s 'cabal-dir v)
232-
(haskell-session-set-cabal-checksum s v))
231+
(let ((true-path (file-truename v)))
232+
(haskell-session-set s 'cabal-dir true-path)
233+
(haskell-session-set-cabal-checksum s true-path)))
233234

234235
(defun haskell-session-set-current-dir (s v)
235236
"Set the session current directory."
236-
(haskell-session-set s 'current-dir v))
237+
(let ((true-path (file-truename v)))
238+
(haskell-session-set s 'current-dir true-path)))
237239

238240
(defun haskell-session-set-cabal-checksum (s cabal-dir)
239241
"Set the session checksum of .cabal files"

0 commit comments

Comments
 (0)