martin/emacs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

(browse-url-elinks-new-window): New function.

Browse Source 
(browse-url-elinks): Use browse-url-elinks-new-window.  Accept
optional second argument `new-window'.  Fix typo in doc-string.
(browse-url-elinks-sentinel): Use browse-url-elinks-new-window.
Improve error message.
This commit is contained in:
Michaël Cadilhac
2007-09-19 11:26:57 +00:00
parent 59c4e1dad9
commit a38de16e85
2 changed files with 35 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lisp/ChangeLog
View File

@@ -1,3 +1,11 @@
2007-09-19 Johannes Weiner <hannes@saeurebad.de>
* net/browse-url.el (browse-url-elinks-new-window): New function.
(browse-url-elinks): Use browse-url-elinks-new-window. Accept
optional second argument `new-window'. Fix typo in doc-string.
(browse-url-elinks-sentinel): Use browse-url-elinks-new-window.
Improve error message.
2007-09-19 Micha,Ak(Bl Cadilhac <michael@cadilhac.name>
* net/browse-url.el (browse-url-url-encode-chars): Use the right

45
lisp/net/browse-url.el
View File

@@ -1517,8 +1517,17 @@ Default to the URL around or before point."
(apply #'start-process (concat "KDE " url) nil browse-url-kde-program
(append browse-url-kde-args (list url))))
(defun browse-url-elinks-new-window (url)
"Ask the Elinks WWW browser to load URL in a new window."
(let ((process-environment (browse-url-process-environment)))
(apply #'start-process
(append (list (concat "elinks:" url)
nil)
browse-url-elinks-wrapper
(list "elinks" url)))))
;;;###autoload
(defun browse-url-elinks (url)
(defun browse-url-elinks (url &optional new-window)
"Ask the Elinks WWW browser to load URL.
Default to the URL around the point.
@@ -1526,36 +1535,36 @@ 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'."
from `browse-url-elinks-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)))))
(if new-window
(browse-url-elinks-new-window 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)))
(let ((exit-status (process-exit-status process)))
;; 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))))
(browse-url-elinks-new-window url))
(0
;; Found an instance, open URL in new tab.
(start-process (concat "elinks:" url) nil
"elinks" "-remote"
(concat "openURL(\"" url "\",new-tab)")))
(let ((process-environment (browse-url-process-environment)))
(start-process (concat "elinks:" url) nil
"elinks" "-remote"
(concat "openURL(\"" url "\",new-tab)"))))
(otherwise
(error "Undefined exit-code of process `elinks'")))))
(error "Unrecognized exit-code %d of process `elinks'"
exit-status)))))
(provide 'browse-url)