[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/net/browse-url.el,v
From: |
Michael Cadilhac |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/net/browse-url.el,v |
Date: |
Wed, 19 Sep 2007 11:26:47 +0000 |
CVSROOT: /sources/emacs
Module name: emacs
Changes by: Michael Cadilhac <cadilhac> 07/09/19 11:26:47
Index: browse-url.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/net/browse-url.el,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -b -r1.64 -r1.65
--- browse-url.el 19 Sep 2007 11:21:47 -0000 1.64
+++ browse-url.el 19 Sep 2007 11:26:46 -0000 1.65
@@ -1517,8 +1517,17 @@
(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 @@
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))
+ (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)))))
+ (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.
+ (let ((process-environment (browse-url-process-environment)))
(start-process (concat "elinks:" url) nil
"elinks" "-remote"
- (concat "openURL(\"" url "\",new-tab)")))
+ (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)
- [Emacs-diffs] Changes to emacs/lisp/net/browse-url.el,v, Glenn Morris, 2007/09/07
- [Emacs-diffs] Changes to emacs/lisp/net/browse-url.el,v, Eli Zaretskii, 2007/09/08
- [Emacs-diffs] Changes to emacs/lisp/net/browse-url.el,v, Michael Cadilhac, 2007/09/12
- [Emacs-diffs] Changes to emacs/lisp/net/browse-url.el,v, Michael Cadilhac, 2007/09/17
- [Emacs-diffs] Changes to emacs/lisp/net/browse-url.el,v, Michael Cadilhac, 2007/09/19
- [Emacs-diffs] Changes to emacs/lisp/net/browse-url.el,v,
Michael Cadilhac <=