[Emacs-diffs] Changes to emacs/lisp/net/browse-url.el,v

[Stefan Monnier]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Stefan Monnier <monnier>        06/12/08 03:17:10

Index: net/browse-url.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/net/browse-url.el,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -b -r1.54 -r1.55
--- net/browse-url.el   20 May 2006 04:29:38 -0000      1.54
+++ net/browse-url.el   8 Dec 2006 03:17:10 -0000       1.55
@@ -760,6 +760,12 @@
   (interactive (browse-url-interactive-arg "URL: "))
   (unless (interactive-p)
     (setq args (or args (list browse-url-new-window-flag))))
+  (let ((process-environment (copy-sequence process-environment)))
+    ;; 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 (functionp browse-url-browser-function)
       (apply browse-url-browser-function url args)
     ;; The `function' can be an alist; look down it for first match
@@ -770,7 +776,7 @@
          (apply (cdr bf) url args)
          (throw 'done t)))
       (error "No browse-url-browser-function matching URL %s"
-            url))))
+               url)))))
 
 ;;;###autoload
 (defun browse-url-at-point (&optional arg)