diff options
| author | Jan Djärv | 2011-06-22 18:44:53 +0200 |
|---|---|---|
| committer | Jan Djärv | 2011-06-22 18:44:53 +0200 |
| commit | 1c0f1a199ca0114d8fa486a1a0df430677b91d5c (patch) | |
| tree | e3f65843309969a32e5c141a1593ae0b5c9ff593 | |
| parent | 94a807ac4e785c6387ddac4380a924a7859ab3f2 (diff) | |
| download | emacs-1c0f1a199ca0114d8fa486a1a0df430677b91d5c.tar.gz emacs-1c0f1a199ca0114d8fa486a1a0df430677b91d5c.zip | |
From Lawrence Mitchell <wence@gmx.li>: Don't hang in browse-url-xdg-open.
* net/browse-url.el (browse-url-xdg-open): Use 0, rather than nil
BUFFER in call-process.
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/net/browse-url.el | 2 |
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 @@ | |||
| 1 | 2011-06-22 Lawrence Mitchell <wence@gmx.li> | ||
| 2 | |||
| 3 | * net/browse-url.el (browse-url-xdg-open): Use 0, rather than nil | ||
| 4 | BUFFER in call-process. | ||
| 5 | |||
| 1 | 2011-06-22 Lars Magne Ingebrigtsen <larsi@gnus.org> | 6 | 2011-06-22 Lars Magne Ingebrigtsen <larsi@gnus.org> |
| 2 | 7 | ||
| 3 | * mail/smtpmail.el (smtpmail-via-smtp): Make sure we don't send | 8 | * 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." | |||
| 958 | ;;;###autoload | 958 | ;;;###autoload |
| 959 | (defun browse-url-xdg-open (url &optional new-window) | 959 | (defun browse-url-xdg-open (url &optional new-window) |
| 960 | (interactive (browse-url-interactive-arg "URL: ")) | 960 | (interactive (browse-url-interactive-arg "URL: ")) |
| 961 | (call-process "nohup" nil nil nil "xdg-open" url)) | 961 | (call-process "xdg-open" nil 0 nil url)) |
| 962 | 962 | ||
| 963 | ;;;###autoload | 963 | ;;;###autoload |
| 964 | (defun browse-url-netscape (url &optional new-window) | 964 | (defun browse-url-netscape (url &optional new-window) |