Merge pull request #1721 from galagora/hoogle-improvements

Restore `haskell-hoogle-command` configurability

Author: purcell

haskell-hoogle.el

@@ -40,33 +40,47 @@
                        nil nil def)
           )))
 
+(defcustom haskell-hoogle-command
+  (if (executable-find "hoogle") "hoogle")
+  "Name of the command to use to query Hoogle.
+Can also be a function that returns the command as a string.
+If nil, use the Hoogle web-site."
+  :group 'haskell
+  :type '(choice (const :tag "Use Web-site" nil)
+                 string
+                 function))
+
+(defcustom haskell-hoogle-url "https://hoogle.haskell.org/?hoogle=%s"
+  "Default value for hoogle web site."
+  :group 'haskell
+  :type '(choice
+          (const :tag "haskell-org" "https://hoogle.haskell.org/?hoogle=%s")
+          (const :tag "fp-complete" "https://www.stackage.org/lts/hoogle?q=%s")
+          string))
+
 ;;;###autoload
 (defun haskell-hoogle (query &optional info)
   "Do a Hoogle search for QUERY.
 
 If prefix argument INFO is given, then `haskell-hoogle-command'
 is asked to show extra info for the items matching QUERY.."
   (interactive (append (hoogle-prompt) current-prefix-arg))
-  (let* ((command (concat (executable-find "hoogle")
+  (if (null haskell-hoogle-command)
+      (browse-url (format haskell-hoogle-url (url-hexify-string query)))
+    (let* ((command (concat (if (functionp haskell-hoogle-command)
+                                (funcall haskell-hoogle-command)
+                              haskell-hoogle-command)
                           (if info " -i " "")
                           " --color " (shell-quote-argument query)))
          (output (shell-command-to-string command)))
     (with-help-window "*hoogle*"
       (with-current-buffer standard-output
         (insert output)
-        (ansi-color-apply-on-region (point-min) (point-max))))))
+        (ansi-color-apply-on-region (point-min) (point-max)))))))
 
 ;;;###autoload
 (defalias 'hoogle 'haskell-hoogle)
 
-(defcustom haskell-hoogle-url "https://hoogle.haskell.org/?hoogle=%s"
-  "Default value for hoogle web site."
-  :group 'haskell
-  :type '(choice
-          (const :tag "haskell-org" "https://hoogle.haskell.org/?hoogle=%s")
-          (const :tag "fp-complete" "https://www.stackage.org/lts/hoogle?q=%s")
-          string))
-
 ;;;###autoload
 (defun haskell-hoogle-lookup-from-website (query)
   "Lookup QUERY at `haskell-hoogle-url'."