[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs/lisp ChangeLog files.el
From: |
Chong Yidong |
Subject: |
[Emacs-diffs] emacs/lisp ChangeLog files.el |
Date: |
Sun, 16 Aug 2009 00:31:33 +0000 |
CVSROOT: /sources/emacs
Module name: emacs
Changes by: Chong Yidong <cyd> 09/08/16 00:31:33
Modified files:
lisp : ChangeLog files.el
Log message:
* files.el (get-free-disk-space): Change fallback default
directory to /. Expand DIR argument before switching to fallback.
Suggested by Kevin Ryde (Bug#2631, Bug#3911).
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.15940&r2=1.15941
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/files.el?cvsroot=emacs&r1=1.1067&r2=1.1068
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.15940
retrieving revision 1.15941
diff -u -b -r1.15940 -r1.15941
--- ChangeLog 15 Aug 2009 17:51:37 -0000 1.15940
+++ ChangeLog 16 Aug 2009 00:31:28 -0000 1.15941
@@ -1,3 +1,9 @@
+2009-08-16 Chong Yidong <address@hidden>
+
+ * files.el (get-free-disk-space): Change fallback default
+ directory to /. Expand DIR argument before switching to fallback.
+ Suggested by Kevin Ryde (Bug#2631, Bug#3911).
+
2009-08-15 Chong Yidong <address@hidden>
* files.el (load-library): Doc fix.
Index: files.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/files.el,v
retrieving revision 1.1067
retrieving revision 1.1068
diff -u -b -r1.1067 -r1.1068
--- files.el 15 Aug 2009 17:51:41 -0000 1.1067
+++ files.el 16 Aug 2009 00:31:32 -0000 1.1068
@@ -5386,7 +5386,7 @@
This function calls `file-system-info' if it is available, or invokes the
program specified by `directory-free-space-program' if that is non-nil."
- (when (not (file-remote-p dir))
+ (unless (file-remote-p dir)
;; Try to find the number of free blocks. Non-Posix systems don't
;; always have df, but might have an equivalent system call.
(if (fboundp 'file-system-info)
@@ -5396,12 +5396,14 @@
(save-match-data
(with-temp-buffer
(when (and directory-free-space-program
- (let ((default-directory
- (if (and (not (file-remote-p default-directory))
+ ;; 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))
- default-directory
- (expand-file-name "~/"))))
+ (setq default-directory "/"))
(eq (call-process directory-free-space-program
nil t nil
directory-free-space-args
- [Emacs-diffs] emacs/lisp ChangeLog files.el, Chong Yidong, 2009/08/14
- [Emacs-diffs] emacs/lisp ChangeLog files.el, Chong Yidong, 2009/08/15
- [Emacs-diffs] emacs/lisp ChangeLog files.el,
Chong Yidong <=
- [Emacs-diffs] emacs/lisp ChangeLog files.el, Chong Yidong, 2009/08/17
- [Emacs-diffs] emacs/lisp ChangeLog files.el, Glenn Morris, 2009/08/22
- [Emacs-diffs] emacs/lisp ChangeLog files.el, Glenn Morris, 2009/08/25
- [Emacs-diffs] emacs/lisp ChangeLog files.el, Stefan Monnier, 2009/08/29