mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2025-01-17 17:58:46 +00:00
Code Issues Releases Activity

(dired-insert-directory): Insert the amount of

Browse Source 
free space after the total size.
(dired-free-space-program, dired-free-space-args): New variables.
This commit is contained in:
Gerd Moellmann 1999-10-14 21:53:37 +00:00
parent e719a6e58f
commit 85852dc7f5
2 changed files with 40 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lisp/ChangeLog
View File

@ -1,3 +1,9 @@
1999-10-14 Richard M. Stallman <rms@caffeine.ai.mit.edu>
* dired.el (dired-insert-directory): Insert the amount of
free space after the total size.
(dired-free-space-program, dired-free-space-args): New variables.
1999-10-14 Karl Heuer <kwzh@gnu.org>
* mail/rmail.el (rmail-pop-password-error): Add new pattern.

35
lisp/dired.el
View File

@ -152,6 +152,21 @@ The target is used in the prompt for file copy, rename etc."
:type 'boolean
:group 'dired)
(defcustom dired-free-space-program "df"
"*Program to get the amount of free space on a file system.
We assume the output has the format of `df'.
The value of this variable must be just a command name or file name;
if you want to specify options, use `dired-free-space-args'.
A value of nil disables this feature."
:type '(choice (string :tag "Program") (const :tag "None" nil))
:group 'dired)
(defcustom dired-free-space-args "-Pk"
"*Options to use when running `dired-free-space-program'."
:type 'string
:group 'dired)
;;; Hook variables
(defvar dired-load-hook nil
@ -658,7 +673,25 @@ If DIRNAME is already in a dired buffer, that buffer is used without refresh."
(cdr dir-or-list))
;; Expand the file name here because it may have been abbreviated
;; in dired-noselect.
(insert-directory (expand-file-name dir-or-list) switches wildcard full-p))
(insert-directory (expand-file-name dir-or-list) switches wildcard full-p)
(when (and full-p dired-free-space-program)
(save-excursion
(goto-char (point-min))
(when (re-search-forward "total [0-9]+$" nil t)
(insert " free ")
(let ((beg (point)))
(call-process dired-free-space-program nil t nil
dired-free-space-args
(expand-file-name dir-or-list))
(goto-char beg)
(forward-line 1)
(skip-chars-forward "^ \t")
(forward-word 2)
(skip-chars-forward " \t")
(delete-region beg (point))
(forward-word 1)
(delete-region (point)
(progn (forward-line 1) (point))))))))
;; Quote certain characters, unless ls quoted them for us.
(if (not (string-match "b" dired-actual-switches))
(save-excursion