2 files changed, 4 insertions, 6 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f2743ad1ee8..80b4ff11881 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
 2009-08-29  Stefan Monnier  <monnier@iro.umontreal.ca>
 
+        * files.el (get-free-disk-space): Use / for default-directory.
+
         * textmodes/ispell.el (ispell-accept-output, ispell-command-loop):
         Use with-current-buffer.
 
diff --git a/lisp/files.el b/lisp/files.el
index a23408a0beb..0731d25b8f5 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -5377,17 +5377,13 @@ program specified by `directory-free-space-program' if that is non-nil."
         (let ((fsinfo (file-system-info dir)))
           (if fsinfo
               (format "%.0f" (/ (nth 2 fsinfo) 1024))))
+      (setq dir (expand-file-name dir))
       (save-match-data
         (with-temp-buffer
           (when (and directory-free-space-program
                      ;; Avoid failure if the default directory does
                      ;; not exist (Bug#2631, Bug#3911).
-                     (let ((default-directory default-directory))
-                       (setq dir (expand-file-name dir))
-                       (unless (and (not (file-remote-p default-directory))
-                                    (file-directory-p default-directory)
-                                    (file-readable-p default-directory))
-                         (setq default-directory "/"))
+                     (let ((default-directory "/")
                        (eq (call-process directory-free-space-program
                                          nil t nil
                                          directory-free-space-args