aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2010-10-07 20:23:31 -0700
committerGlenn Morris2010-10-07 20:23:31 -0700
commite4adf61e9aaf46b23b7ea7e54c79725d5c3b45fb (patch)
tree7ee7aa9ab2e06d7e4240f54cf35e83395c8b5c42
parent360ac53066ccc832a8f0d8b4a7fad4353571ff57 (diff)
downloademacs-e4adf61e9aaf46b23b7ea7e54c79725d5c3b45fb.tar.gz
emacs-e4adf61e9aaf46b23b7ea7e54c79725d5c3b45fb.zip
* lisp/net/browse-url.el (browse-url-xdg-open): Shell-quote url. (Bug#7166)
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/net/browse-url.el3
2 files changed, 5 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 4c3d419d0aa..06313acc705 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
12010-10-08 Glenn Morris <rgm@gnu.org>
2
3 * net/browse-url.el (browse-url-xdg-open): Shell-quote url. (Bug#7166)
4
12010-10-07 Chong Yidong <cyd@stupidchicken.com> 52010-10-07 Chong Yidong <cyd@stupidchicken.com>
2 6
3 * cus-edit.el (custom-variable, custom-face): Doc fix. 7 * cus-edit.el (custom-variable, custom-face): Doc fix.
diff --git a/lisp/net/browse-url.el b/lisp/net/browse-url.el
index d98c72570a4..65b45aecf3e 100644
--- a/lisp/net/browse-url.el
+++ b/lisp/net/browse-url.el
@@ -939,7 +939,7 @@ Galeon, Konqueror, Netscape, Mosaic, Lynx in an xterm, and then W3."
939 (interactive (browse-url-interactive-arg "URL: ")) 939 (interactive (browse-url-interactive-arg "URL: "))
940 (call-process "/bin/sh" nil nil nil 940 (call-process "/bin/sh" nil nil nil
941 "-c" 941 "-c"
942 (concat "nohup xdg-open " url 942 (concat "nohup xdg-open " (shell-quote-argument url)
943 ">/dev/null 2>&1 </dev/null"))) 943 ">/dev/null 2>&1 </dev/null")))
944 944
945;;;###autoload 945;;;###autoload
@@ -1571,5 +1571,4 @@ from `browse-url-elinks-wrapper'."
1571 1571
1572(provide 'browse-url) 1572(provide 'browse-url)
1573 1573
1574;; arch-tag: d2079573-5c06-4097-9598-f550fba19430
1575;;; browse-url.el ends here 1574;;; browse-url.el ends here