[Emacs-diffs] /srv/bzr/emacs/trunk r103513: browse-url fix for bug#6077.

[Glenn Morris]

------------------------------------------------------------
revno: 103513
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Fri 2011-03-04 00:21:56 -0800
message:
  browse-url fix for bug#6077.
  
  * lisp/net/browse-url.el (browse-url): Handle deleted default-directory.
modified:
  lisp/ChangeLog
  lisp/net/browse-url.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-03-04 08:14:57 +0000
+++ b/lisp/ChangeLog    2011-03-04 08:21:56 +0000
@@ -1,5 +1,8 @@
 2011-03-04  Glenn Morris  <address@hidden>
 
+       * 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)
 

=== modified file 'lisp/net/browse-url.el'
--- a/lisp/net/browse-url.el    2011-01-26 08:36:39 +0000
+++ b/lisp/net/browse-url.el    2011-03-04 08:21:56 +0000
@@ -798,7 +798,12 @@
   (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.