From: Chong Yidong <cyd@stupidchicken.com>
Date: Sun, 15 Mar 2009 02:31:45 +0000 (+0000)
Subject: (get-free-disk-space): Ensure that default-directory is
X-Git-Tag: emacs-pretest-23.0.92~194
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=86c7144b37dd6630923ded29cc0f130df51ce617;p=emacs.git

(get-free-disk-space): Ensure that default-directory is
usable before calling call-process.  Suggested by Kevin
Ryde (Bug#2631).
---

diff --git a/lisp/files.el b/lisp/files.el
index 00207d63b24..eb7fe021e4b 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -5336,10 +5336,17 @@ program specified by `directory-free-space-program' if that is non-nil."
       (save-match-data
 	(with-temp-buffer
 	  (when (and directory-free-space-program
-		     (eq 0 (call-process directory-free-space-program
+		     (let ((default-directory
+			     (if (and (not (file-remote-p default-directory))
+				      (file-directory-p default-directory)
+				      (file-readable-p default-directory))
+				 default-directory
+			       (expand-file-name "~/"))))
+		       (eq (call-process directory-free-space-program
 					 nil t nil
 					 directory-free-space-args
-					 dir)))
+					 dir)
+			   0)))
 	    ;; Usual format is a header line followed by a line of
 	    ;; numbers.
 	    (goto-char (point-min))