summaryrefslogtreecommitdiff
path: root/helm-net.el
diff options
context:
space:
mode:
authorThierry Volpiatto <thierry.volpiatto@gmail.com>2014-07-05 12:20:19 +0200
committerThierry Volpiatto <thierry.volpiatto@gmail.com>2014-07-05 12:20:19 +0200
commitaf48ef585ee9fd9d10631cb61513e9442b9aba8b (patch)
tree3c83fcd6e997375411fb46cbac0b0d4895f0b53a /helm-net.el
parente88409cab7a74318142de1a1142be3e808aa8f7e (diff)
* helm-net.el: Allow using conkeror.
Diffstat (limited to 'helm-net.el')
-rw-r--r--helm-net.el17
1 files changed, 12 insertions, 5 deletions
diff --git a/helm-net.el b/helm-net.el
index 08e2c8bb..4e9d3dcd 100644
--- a/helm-net.el
+++ b/helm-net.el
@@ -465,11 +465,13 @@ Return an alist with elements like (data . number_results)."
(defvar helm-browse-url-chromium-program "chromium-browser")
(defvar helm-browse-url-uzbl-program "uzbl-browser")
+(defvar helm-browse-url-conkeror-program "conkeror")
(defvar helm-browse-url-default-browser-alist
`((,(or (and (boundp 'w3m-command) w3m-command)
"/usr/bin/w3m") . w3m-browse-url)
(,browse-url-firefox-program . browse-url-firefox)
(,helm-browse-url-chromium-program . helm-browse-url-chromium)
+ (,helm-browse-url-conkeror-program . helm-browse-url-conkeror)
(,helm-browse-url-uzbl-program . helm-browse-url-uzbl)
(,browse-url-kde-program . browse-url-kde)
(,browse-url-gnome-moz-program . browse-url-gnome-moz)
@@ -481,11 +483,11 @@ Return an alist with elements like (data . number_results)."
("emacs" . eww-browse-url))
"*Alist of \(executable . function\) to try to find a suitable url browser.")
-(cl-defun helm-generic-browser (url name &rest args)
+(cl-defun helm-generic-browser (url cmd-name &rest args)
"Browse URL with NAME browser."
- (let ((proc (concat name " " url)))
- (message "Starting %s..." name)
- (apply 'start-process proc nil name
+ (let ((proc (concat cmd-name " " url)))
+ (message "Starting %s..." cmd-name)
+ (apply 'start-process proc nil cmd-name
(append args (list url)))
(set-process-sentinel
(get-process proc)
@@ -493,7 +495,7 @@ Return an alist with elements like (data . number_results)."
(when (string= event "finished\n")
(message "%s process %s" process event))))))
-(defun helm-browse-url-chromium (url)
+(defun helm-browse-url-chromium (url &optional _ignore)
"Browse URL with google chrome browser."
(interactive "sURL: ")
(helm-generic-browser
@@ -504,6 +506,11 @@ Return an alist with elements like (data . number_results)."
(interactive "sURL: ")
(helm-generic-browser url helm-browse-url-uzbl-program "-u"))
+(defun helm-browse-url-conkeror (url &optional _ignore)
+ "Browse URL with conkeror browser."
+ (interactive "sURL: ")
+ (helm-generic-browser url helm-browse-url-conkeror-program))
+
(defun helm-browse-url-default-browser (url &rest args)
"Find the first available browser and ask it to load URL."
(let ((default-browser-fn