comparison lisp/dired.el @ 28399:85a5bab7541d

(dired-insert-directory): If dired-free-space-program failed just delete its output.
author Andreas Schwab <schwab@suse.de>
date Wed, 29 Mar 2000 20:02:10 +0000
parents 1e17908c52b8
children fcd4ecfbaafe
comparison
equal deleted inserted replaced
28398:844fb933c1aa 28399:85a5bab7541d
679 (save-excursion 679 (save-excursion
680 (goto-char (point-min)) 680 (goto-char (point-min))
681 (when (re-search-forward "total [0-9]+$" nil t) 681 (when (re-search-forward "total [0-9]+$" nil t)
682 (insert " free ") 682 (insert " free ")
683 (let ((beg (point))) 683 (let ((beg (point)))
684 (call-process dired-free-space-program nil t nil 684 (if (zerop (call-process dired-free-space-program nil t nil
685 dired-free-space-args 685 dired-free-space-args
686 (expand-file-name dir-or-list)) 686 (expand-file-name dir-or-list)))
687 (goto-char beg) 687 (progn
688 (forward-line 1) 688 (goto-char beg)
689 (skip-chars-forward "^ \t") 689 (forward-line 1)
690 (forward-word 2) 690 (skip-chars-forward "^ \t")
691 (skip-chars-forward " \t") 691 (forward-word 2)
692 (delete-region beg (point)) 692 (skip-chars-forward " \t")
693 (forward-word 1) 693 (delete-region beg (point))
694 (delete-region (point) 694 (forward-word 1)
695 (progn (forward-line 1) (point)))))))) 695 (delete-region (point)
696 (progn (forward-line 1) (point))))
697 ;; The dired-free-space-program failed; delete its output
698 (delete-region (- beg 7) (point))))))))
696 ;; Quote certain characters, unless ls quoted them for us. 699 ;; Quote certain characters, unless ls quoted them for us.
697 (if (not (string-match "b" dired-actual-switches)) 700 (if (not (string-match "b" dired-actual-switches))
698 (save-excursion 701 (save-excursion
699 (setq end (point-marker)) 702 (setq end (point-marker))
700 (goto-char opoint) 703 (goto-char opoint)