diff options
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/files.el | 3 | ||||
| -rw-r--r-- | lisp/term/mac-win.el | 5 |
3 files changed, 8 insertions, 5 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 5a7455464a..1a7d93ab42 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2002-06-30 Andreas Schwab <[email protected]> + + * files.el (directory-free-space-args): Don't use `-P' on Darwin. + * term/mac-win.el: Don't set it here. + 2002-06-29 Andreas Schwab <[email protected]> * term/mac-win.el: Use directory-free-space-program instead of diff --git a/lisp/files.el b/lisp/files.el index 5c1396fc7b..0488c7a984 100644 --- a/lisp/files.el +++ b/lisp/files.el @@ -3770,7 +3770,8 @@ preference to the program given by this variable." :type '(choice (string :tag "Program") (const :tag "None" nil)) :group 'dired) -(defcustom directory-free-space-args "-Pk" +(defcustom directory-free-space-args + (if (eq system-type 'darwin) "-k" "-Pk") "*Options to use when running `directory-free-space-program'." :type 'string :group 'dired) diff --git a/lisp/term/mac-win.el b/lisp/term/mac-win.el index 2465126dbd..a9ac12f085 100644 --- a/lisp/term/mac-win.el +++ b/lisp/term/mac-win.el @@ -104,10 +104,7 @@ ;; Don't have this yet. (fset 'x-get-resource 'ignore) -(if (eq system-type 'darwin) - ;; df on Darwin does not understand -P - (setq directory-free-space-args "-k") - +(unless (eq system-type 'darwin) ;; This variable specifies the Unix program to call (as a process) to ;; deteremine the amount of free space on a file system (defaults to ;; df). If it is not set to nil, ls-lisp will not work correctly |