diff options
| author | Andreas Schwab | 2002-06-30 14:42:19 +0000 |
|---|---|---|
| committer | Andreas Schwab | 2002-06-30 14:42:19 +0000 |
| commit | 525fdbc9c89cde92736181df532d0ec2a7f2e558 (patch) | |
| tree | aa8e7a0ce87feba3d92a15b75807438ad44cff24 | |
| parent | 7e30f58e10c7437d63cb8773ab813a78a5d2dd70 (diff) | |
| download | emacs-525fdbc9c89cde92736181df532d0ec2a7f2e558.tar.gz emacs-525fdbc9c89cde92736181df532d0ec2a7f2e558.zip | |
* files.el (directory-free-space-args): Don't use -P on Darwin.
* term/mac-win.el: Don't set it here.
| -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 5a7455464a1..1a7d93ab424 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2002-06-30 Andreas Schwab <schwab@suse.de> | ||
| 2 | |||
| 3 | * files.el (directory-free-space-args): Don't use `-P' on Darwin. | ||
| 4 | * term/mac-win.el: Don't set it here. | ||
| 5 | |||
| 1 | 2002-06-29 Andreas Schwab <schwab@suse.de> | 6 | 2002-06-29 Andreas Schwab <schwab@suse.de> |
| 2 | 7 | ||
| 3 | * term/mac-win.el: Use directory-free-space-program instead of | 8 | * term/mac-win.el: Use directory-free-space-program instead of |
diff --git a/lisp/files.el b/lisp/files.el index 5c1396fc7b2..0488c7a9847 100644 --- a/lisp/files.el +++ b/lisp/files.el | |||
| @@ -3770,7 +3770,8 @@ preference to the program given by this variable." | |||
| 3770 | :type '(choice (string :tag "Program") (const :tag "None" nil)) | 3770 | :type '(choice (string :tag "Program") (const :tag "None" nil)) |
| 3771 | :group 'dired) | 3771 | :group 'dired) |
| 3772 | 3772 | ||
| 3773 | (defcustom directory-free-space-args "-Pk" | 3773 | (defcustom directory-free-space-args |
| 3774 | (if (eq system-type 'darwin) "-k" "-Pk") | ||
| 3774 | "*Options to use when running `directory-free-space-program'." | 3775 | "*Options to use when running `directory-free-space-program'." |
| 3775 | :type 'string | 3776 | :type 'string |
| 3776 | :group 'dired) | 3777 | :group 'dired) |
diff --git a/lisp/term/mac-win.el b/lisp/term/mac-win.el index 2465126dbd6..a9ac12f085e 100644 --- a/lisp/term/mac-win.el +++ b/lisp/term/mac-win.el | |||
| @@ -104,10 +104,7 @@ | |||
| 104 | ;; Don't have this yet. | 104 | ;; Don't have this yet. |
| 105 | (fset 'x-get-resource 'ignore) | 105 | (fset 'x-get-resource 'ignore) |
| 106 | 106 | ||
| 107 | (if (eq system-type 'darwin) | 107 | (unless (eq system-type 'darwin) |
| 108 | ;; df on Darwin does not understand -P | ||
| 109 | (setq directory-free-space-args "-k") | ||
| 110 | |||
| 111 | ;; This variable specifies the Unix program to call (as a process) to | 108 | ;; This variable specifies the Unix program to call (as a process) to |
| 112 | ;; deteremine the amount of free space on a file system (defaults to | 109 | ;; deteremine the amount of free space on a file system (defaults to |
| 113 | ;; df). If it is not set to nil, ls-lisp will not work correctly | 110 | ;; df). If it is not set to nil, ls-lisp will not work correctly |