[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 2/2] browse-url.el: elinks support
From: |
Johannes Weiner |
Subject: |
[PATCH 2/2] browse-url.el: elinks support |
Date: |
Wed, 22 Aug 2007 03:19:08 +0200 |
User-agent: |
Mutt/1.5.16 (2007-06-11) |
Hi,
this patch adds `browse-url-elinks'.
Hannes
diff -Naur emacs.orig/lisp/net/browse-url.el emacs/lisp/net/browse-url.el
--- emacs.orig/lisp/net/browse-url.el 2007-08-22 02:40:40.000000000 +0200
+++ emacs/lisp/net/browse-url.el 2007-08-22 02:57:32.000000000 +0200
@@ -55,6 +55,7 @@
;; browse-url-default-macosx-browser Mac OS X browser
;; browse-url-gnome-moz GNOME interface to Mozilla
;; browse-url-kde KDE konqueror (kfm)
+;; browse-url-elinks Elinks Don't know (tried with
0.12.GIT)
;; [A version of the Netscape browser is now free software
;; <URL:http://www.mozilla.org/>, albeit not GPLed, so it is
@@ -263,6 +264,7 @@
(function-item :tag "Grail" :value browse-url-grail)
(function-item :tag "MMM" :value browse-url-mmm)
(function-item :tag "KDE" :value browse-url-kde)
+ (function-item :tag "Elinks" :value browse-url-elinks)
(function-item :tag "Specified by `Browse Url Generic Program'"
:value browse-url-generic)
(function-item :tag "Default Windows browser"
@@ -611,6 +613,11 @@
:type '(repeat (string :tag "Argument"))
:group 'browse-url)
+(defcustom browse-url-elinks-wrapper '("xterm" "-e")
+ "*Wrapper command prepended to the Elinks command-line."
+ :type '(repeat (string :tag "Wrapper"))
+ :group 'browse-url)
+
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; URL encoding
@@ -1493,6 +1500,46 @@
(apply #'start-process (concat "KDE " url) nil browse-url-kde-program
(append browse-url-kde-args (list url))))
+;;;###autoload
+(defun browse-url-elinks (url)
+ "Ask the Elinks WWW browser to load URL.
+Default to the URL around the point.
+
+The document is loaded in a new tab of a running Elinks or, if
+none yet running, a newly started instance.
+
+The Elinks command will be prepended by the program+arguments
+from `elinks-browse-url-wrapper'."
+ (interactive (browse-url-interactive-arg "URL: "))
+ (setq url (browse-url-encode-url url))
+ (let ((process-environment (browse-url-process-environment))
+ (elinks-ping-process (start-process "elinks-ping" nil
+ "elinks" "-remote" "ping()")))
+ (set-process-sentinel elinks-ping-process
+ `(lambda (process change)
+ (browse-url-elinks-sentinel process ,url)))))
+
+(defun browse-url-elinks-sentinel (process url)
+ "Determines if Elinks is running or a new one has to be started."
+ (let ((exit-status (process-exit-status process))
+ (process-environment (browse-url-process-environment)))
+ ;; Try to determine if an instance is running or if we have to
+ ;; create a new one.
+ (case exit-status
+ (5
+ ;; No instance, start a new one.
+ (apply #'start-process
+ (append (list (concat "elinks:" url) nil)
+ browse-url-elinks-wrapper
+ (list "elinks" url))))
+ (0
+ ;; Found an instance, open URL in new tab.
+ (start-process (concat "elinks:" url) nil
+ "elinks" "-remote"
+ (concat "openURL(\"" url "\",new-tab)")))
+ (otherwise
+ (error "Undefined exit-code of process `elinks'.")))))
+
(provide 'browse-url)
;;; arch-tag: d2079573-5c06-4097-9598-f550fba19430