merge from trunk

[gnu-emacs] / lisp / net / browse-url.el

diff --git a/lisp/net/browse-url.el b/lisp/net/browse-url.el
index 3d034c4a0fa4cc639cf60ea756a7422517ae47ef..462bf18997bdce3fb1c07969d4eebf26b175179b 100644 (file)
--- a/lisp/net/browse-url.el
+++ b/lisp/net/browse-url.el
@@ -825,8 +825,8 @@ first, if that exists."
     ;; When connected to various displays, be careful to use the display of
     ;; the currently selected frame, rather than the original start display,
     ;; which may not even exist any more.
-    (if (stringp (frame-parameter (selected-frame) 'display))
-        (setenv "DISPLAY" (frame-parameter (selected-frame) 'display)))
+    (if (stringp (frame-parameter nil 'display))
+        (setenv "DISPLAY" (frame-parameter nil 'display)))
     (if (and (consp function)
             (not (functionp function)))
        ;; The `function' can be an alist; look down it for first match