File tree 3 files changed +16
-14
lines changed
3 files changed +16
-14
lines changed Original file line number Diff line number Diff line change 49
49
; ; fields))
50
50
51
51
(with-no-warnings (require 'cl ))
52
-
53
- (declare-function haskell-read-directory-name " haskell-process.el" (prompt default ))
52
+ (require 'haskell-utils )
54
53
55
54
(defconst haskell-cabal-general-fields
56
55
; ; Extracted with (haskell-cabal-extract-fields-from-doc "general-fields")
164
163
and indeed just prompting the user. Do them all."
165
164
(let* ((file (haskell-cabal-find-file))
166
165
(dir (when file (file-name-directory file))))
167
- (haskell-read-directory-name
166
+ (haskell-utils- read-directory-name
168
167
(format " Cabal dir%s : " (if file (format " (guessed from %s ) " (file-relative-name file)) " " ))
169
168
dir)))
170
169
Original file line number Diff line number Diff line change @@ -766,7 +766,7 @@ from `module-buffer'."
766
766
(haskell-session-get session 'current-dir ))
767
767
(progn (haskell-session-set-current-dir
768
768
session
769
- (haskell-read-directory-name
769
+ (haskell-utils- read-directory-name
770
770
(if change " Change directory: " " Set current directory: " )
771
771
(or (haskell-session-get session 'current-dir )
772
772
(haskell-session-get session 'cabal-dir )
@@ -775,16 +775,6 @@ from `module-buffer'."
775
775
" ~/" ))))
776
776
(haskell-session-get session 'current-dir ))))
777
777
778
- (defun haskell-read-directory-name (prompt default )
779
- " Read in a directory name, properly normalized."
780
- (let ((filename (file-truename
781
- (read-directory-name
782
- prompt
783
- default
784
- default ))))
785
- (concat (replace-regexp-in-string " /$" " " filename)
786
- " /" )))
787
-
788
778
(defun haskell-process-change-dir (session process dir )
789
779
" Change the directory of the current process."
790
780
(haskell-process-queue-command
Original file line number Diff line number Diff line change 38
38
; ; require/depend-on any other haskell-mode modules in order to
39
39
; ; stay at the bottom of the module dependency graph.
40
40
41
+
42
+ (defun haskell-utils-read-directory-name (prompt default )
43
+ " Read directory name and normalize to true absolute path.
44
+ Refer to `read-directory-name' for the meaning of PROMPT and
45
+ DEFAULT."
46
+ (let ((filename (file-truename
47
+ (read-directory-name prompt
48
+ default
49
+ default ))))
50
+ (concat (replace-regexp-in-string " /$" " " filename)
51
+ " /" )))
52
+
53
+
41
54
(provide 'haskell-utils )
42
55
43
56
; ;; haskell-utils.el ends here
You can’t perform that action at this time.
0 commit comments