browse-url fix for bug#6077.

* lisp/net/browse-url.el (browse-url): Handle deleted default-directory.

2 files changed, 9 insertions, 1 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e506705e6e4..c550cd4e852 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2011-03-04  Glenn Morris  <rgm@gnu.org>
 
+        * net/browse-url.el (browse-url):
+        Handle deleted default-directory.  (Bug#6077)
+
         * recentf.el (recentf-include-p): In case of a buggy predicate,
         err on the side of including, not excluding.  (Bug#5843)
 
diff --git a/lisp/net/browse-url.el b/lisp/net/browse-url.el
index 660eb3b968e..24dbfc0c30a 100644
--- a/lisp/net/browse-url.el
+++ b/lisp/net/browse-url.el
@@ -798,7 +798,12 @@ first, if that exists."
   (let ((process-environment (copy-sequence process-environment))
         (function (or (and (string-match "\\`mailto:" url)
                            browse-url-mailto-function)
-                      browse-url-browser-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 "~/"))))
     ;; 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.