[PATCH] lisp/browse-url.el: Revisiting my elinks addition

[Johannes Weiner]

Hi,

attached is a patch that fixes some issues with the new elinks support in
browse-url.el.  Please see the patch, it includes a lisp/ChangeLog entry.

        Hannes

Index: lisp/ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.11743
diff -u -r1.11743 ChangeLog
--- lisp/ChangeLog      14 Sep 2007 08:10:15 -0000      1.11743
+++ lisp/ChangeLog      14 Sep 2007 10:50:15 -0000
@@ -1,3 +1,11 @@
+2007-09-14  Johannes Weiner <address@hidden>
+
+       * 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'.
+       (browse-url-elinks-sentinel): Use browse-url-elinks-new-window.
+       Improved error message.
+
 2007-09-14  Glenn Morris  <address@hidden>
 
        * startup.el (fancy-startup-text, fancy-about-text): Fix face
Index: lisp/net/browse-url.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/net/browse-url.el,v
retrieving revision 1.62
diff -u -r1.62 browse-url.el
--- lisp/net/browse-url.el      12 Sep 2007 11:48:22 -0000      1.62
+++ lisp/net/browse-url.el      14 Sep 2007 10:50:15 -0000
@@ -1512,8 +1512,16 @@
   (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.
 
@@ -1524,33 +1532,31 @@
 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)))))
+  (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)))
-    ;; Try to determine if an instance is running or if we have to
-    ;; create a new one.
+  (let ((exit-status (process-exit-status process)))
     (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)

signature.asc
Description: Digital signature