Merge from trunk.

2 files changed, 6 insertions, 1 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 57f4608ab72..6fb8a993d57 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2011-06-22  Lawrence Mitchell  <wence@gmx.li>
+
+        * net/browse-url.el (browse-url-xdg-open): Use 0, rather than nil
+        BUFFER in call-process.
+
 2011-06-22  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
         * mail/smtpmail.el (smtpmail-via-smtp): Make sure we don't send
diff --git a/lisp/net/browse-url.el b/lisp/net/browse-url.el
index c1ec3f0ed13..d9e6827d2df 100644
--- a/lisp/net/browse-url.el
+++ b/lisp/net/browse-url.el
@@ -958,7 +958,7 @@ Galeon, Konqueror, Netscape, Mosaic, Lynx in an xterm, and then W3."
 ;;;###autoload
 (defun browse-url-xdg-open (url &optional new-window)
   (interactive (browse-url-interactive-arg "URL: "))
-  (call-process "nohup" nil nil nil "xdg-open" url))
+  (call-process "xdg-open" nil 0 nil url))
 
 ;;;###autoload
 (defun browse-url-netscape (url &optional new-window)