hasufell/ghc-mod
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix breakage caused by previous commit

Browse Source
This commit is contained in:
Daniel Schoepe 2010-10-27 21:45:15 +02:00
parent 3017ea063e
commit aaf72e536b
1 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
elisp/ghc-doc.el
View File

@ -22,8 +22,9 @@
(with-temp-buffer (with-temp-buffer
(call-process "ghc-pkg" nil t nil "find-module" "--simple-output" mod) (call-process "ghc-pkg" nil t nil "find-module" "--simple-output" mod)
(goto-char (point-min)) (goto-char (point-min))
(when (re-search-forward "[^ ]+-[0-9]*\\(\\.[0-9]+\\)*$") (when (re-search-forward "\\([^ ]+\\)-\\([0-9]*\\(\\.[0-9]+\\)*\\)$")
(match-string-no-properties 0)))) (cons (match-string-no-properties 1)
(match-string-no-properties 2)))))
(defun ghc-resolve-document-path (pkg) (defun ghc-resolve-document-path (pkg)
(with-temp-buffer (with-temp-buffer
@ -36,17 +37,23 @@
(defconst ghc-doc-local-format "file://%s/%s.html") (defconst ghc-doc-local-format "file://%s/%s.html")
(defconst ghc-doc-hackage-format (defconst ghc-doc-hackage-format
"http://hackage.haskell.org/packages/archive/%s/latest/doc/html/%s.html") "http://hackage.haskell.org/packages/archive/%s/%s/doc/html/%s.html")
(defun ghc-display-document (pkg mod haskell-org) (defun ghc-display-document (pkg mod haskell-org)
(when (and pkg mod) (when (and pkg mod)
(let* ((mod- (ghc-replace-character mod ?. ?-)) (let* ((mod- (ghc-replace-character mod ?. ?-))
(url (if haskell-org (url (if haskell-org
(format ghc-doc-hackage-format pkg mod-) (format ghc-doc-hackage-format (car pkg) (cdr pkg) mod-)
(format ghc-doc-local-format (let* ((pkg-with-ver (format "%s-%s" (car pkg) (cdr pkg)))
(ghc-resolve-document-path pkg) mod-)))) (path (ghc-resolve-document-path pkg-with-ver)))
(if (file-exists-p (format "%s/%s.html" path mod-))
(format ghc-doc-local-format path mod-)
;; fall back to online version if local file
;; doesn't exist:
(format ghc-doc-hackage-format (car pkg) (cdr pkg) mod-))))))
(browse-url url)))) (browse-url url))))
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
(defvar ghc-input-map nil) (defvar ghc-input-map nil)