Merge from emacs-24; up to 2014-05-15T16:55:18Z!jan.h.d@swipnet.se

1 files changed, 4 insertions, 4 deletions

diff --git a/lisp/net/browse-url.el b/lisp/net/browse-url.el
index 33f4eda9604..9644a509b22 100644
--- a/lisp/net/browse-url.el
+++ b/lisp/net/browse-url.el
@@ -807,15 +807,15 @@ first, if that exists."
   (interactive (browse-url-interactive-arg "URL: "))
   (unless (called-interactively-p 'interactive)
     (setq args (or args (list browse-url-new-window-flag))))
+  (when (and url-handler-mode (not (file-name-absolute-p url)))
+    (setq url (expand-file-name url)))
   (let ((process-environment (copy-sequence process-environment))
         (function (or (and (string-match "\\`mailto:" url)
                            browse-url-mailto-function)
                       browse-url-browser-function))
         ;; Ensure that `default-directory' exists and is readable (b#6077).
-        (default-directory (if (and (file-directory-p default-directory)
-                                    (file-readable-p default-directory))
-                               default-directory
-                             (expand-file-name "~/"))))
+        (default-directory (or (unhandled-file-name-directory default-directory)
+                               (expand-file-name "~/"))))
     ;; 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.