Fix for browse-url-firefox on Windows.

* lisp/net/browse-url.el (browse-url-firefox): Don't call
browse-url-firefox-sentinel unless using -remote.

Fixes: debbugs:9328

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c655c4968df652ec17507e49800516ddd3069d4d..06dd2bf11984a14f921e15a91889a77f6ff80974 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2011-08-21  Chong Yidong  <cyd@stupidchicken.com>
+
+       * net/browse-url.el (browse-url-firefox): Don't call
+       browse-url-firefox-sentinel unless using -remote (Bug#9328).
+
 2011-08-20  Glenn Morris  <rgm@gnu.org>
 
        * tutorial.el (help-with-tutorial): Avoid an error on short screens.

diff --git a/lisp/net/browse-url.el b/lisp/net/browse-url.el
index e18b42a275f72b7364938efcf789bbbf70f49fb6..f9bc13e1e2579e6b2448f36adf46ac5d3826e1b1 100644 (file)
--- a/lisp/net/browse-url.el
+++ b/lisp/net/browse-url.el
@@ -1103,26 +1103,32 @@ URL in a new window."
   (interactive (browse-url-interactive-arg "URL: "))
   (setq url (browse-url-encode-url url))
   (let* ((process-environment (browse-url-process-environment))
+        (use-remote
+         (not (memq system-type '(windows-nt ms-dos))))
         (process
          (apply 'start-process
                 (concat "firefox " url) nil
                 browse-url-firefox-program
                 (append
                  browse-url-firefox-arguments
-                 (if (memq system-type '(windows-nt ms-dos))
-                     (list url)
-                   (list "-remote"
-                         (concat "openURL("
-                                 url
-                                 (if (browse-url-maybe-new-window
-                                      new-window)
-                                     (if browse-url-firefox-new-window-is-tab
-                                         ",new-tab"
-                                       ",new-window"))
-                                 ")")))))))
-    (set-process-sentinel process
-                         `(lambda (process change)
-                            (browse-url-firefox-sentinel process ,url)))))
+                 (if use-remote
+                     (list "-remote"
+                           (concat
+                            "openURL("
+                            url
+                            (if (browse-url-maybe-new-window new-window)
+                                (if browse-url-firefox-new-window-is-tab
+                                    ",new-tab"
+                                  ",new-window"))
+                            ")"))
+                   (list url))))))
+    ;; If we use -remote, the process exits with status code 2 if
+    ;; Firefox is not already running.  The sentinel runs firefox
+    ;; directly if that happens.
+    (when use-remote
+      (set-process-sentinel process
+                           `(lambda (process change)
+                              (browse-url-firefox-sentinel process ,url))))))
 
 (defun browse-url-firefox-sentinel (process url)
   "Handle a change to the process communicating with Firefox."