ghc-mod 0.4.3 → 0.4.4

raw patch · 5 files changed

+12/−11 lines, 5 files

Files

• GHCMod.hs +1/−1
• elisp/ghc-comp.el +8/−7
• elisp/ghc-doc.el +1/−1
• elisp/ghc.el +1/−1
• ghc-mod.cabal +1/−1

@@ -20,7 +20,7 @@ ----------------------------------------------------------------  usage :: String-usage =    "ghc-mod version 0.4.2\n"+usage =    "ghc-mod version 0.4.4\n"         ++ "Usage:\n"         ++ "\t ghc-mod [-l] list\n"         ++ "\t ghc-mod [-l] lang\n"

@@ -155,12 +155,15 @@     (set-window-configuration ghc-window-configuration)     (setq ghc-window-configuration nil))) +(defun ghc-module-completion-p ()+  (or (minibufferp)+      (save-excursion+	(beginning-of-line)+	(looking-at "import "))))+ (defun ghc-select-completion-symbol ()   (cond-   ((or (minibufferp)-	(save-excursion-	  (beginning-of-line)-	  (looking-at "import ")))+   ((ghc-module-completion-p)     ghc-module-names)    ((save-excursion       (beginning-of-line)@@ -177,9 +180,7 @@ (defun ghc-completion-start-point ()   (save-excursion     (let ((beg (save-excursion (beginning-of-line) (point)))-	  (regex (save-excursion-		   (beginning-of-line)-		   (if (looking-at "^import ") "[ (,`]" "[ (,`.]"))))+	  (regex (if (ghc-module-completion-p) "[ (,`]" "[ (,`.]")))       (if (re-search-backward regex beg t) 	  (1+ (point)) 	beg))))

@@ -22,7 +22,7 @@   (with-temp-buffer     (call-process "ghc-pkg" nil t nil "find-module" "--simple-output" mod)     (goto-char (point-min))-    (when (looking-at "^\\([^-]+\\)-")+    (when (looking-at "^\\([^ ]+\\)-[0-9]")       (match-string-no-properties 1))))  (defun ghc-resolve-document-path (pkg)

@@ -16,7 +16,7 @@  ;;; Code: -(defconst ghc-version "0.4.0")+(defconst ghc-version "0.4.4")  ;; (eval-when-compile ;;  (require 'haskell-mode))

@@ -1,5 +1,5 @@ Name:                   ghc-mod-Version:                0.4.3+Version:                0.4.4 Author:                 Kazu Yamamoto <kazu@iij.ad.jp> Maintainer:             Kazu Yamamoto <kazu@iij.ad.jp> License:                BSD3