diff options
| author | Jason Rumney | 2000-10-19 19:50:13 +0000 |
|---|---|---|
| committer | Jason Rumney | 2000-10-19 19:50:13 +0000 |
| commit | 783e8230866622b5469c8dd320bfab59e78079d7 (patch) | |
| tree | 57258dcd7c7843cbcea2862ef90518591facb54e | |
| parent | 0b6bb670882121224aec4a76555b2c526fdf8d03 (diff) | |
| download | emacs-783e8230866622b5469c8dd320bfab59e78079d7.tar.gz emacs-783e8230866622b5469c8dd320bfab59e78079d7.zip | |
(dired-insert-directory): Do not let errors signalled by
attempt to run dired-free-space-program prevent dired from working.
| -rw-r--r-- | lisp/dired.el | 32 |
1 files changed, 17 insertions, 15 deletions
diff --git a/lisp/dired.el b/lisp/dired.el index 5308cdb7e1a..795ca3c3005 100644 --- a/lisp/dired.el +++ b/lisp/dired.el | |||
| @@ -687,21 +687,23 @@ If DIRNAME is already in a dired buffer, that buffer is used without refresh." | |||
| 687 | (when (re-search-forward "total [0-9]+$" nil t) | 687 | (when (re-search-forward "total [0-9]+$" nil t) |
| 688 | (insert " free ") | 688 | (insert " free ") |
| 689 | (let ((beg (point))) | 689 | (let ((beg (point))) |
| 690 | (if (zerop (call-process dired-free-space-program nil t nil | 690 | (condition-case nil |
| 691 | dired-free-space-args | 691 | (if (zerop (call-process dired-free-space-program nil t nil |
| 692 | (expand-file-name dir-or-list))) | 692 | dired-free-space-args |
| 693 | (progn | 693 | (expand-file-name dir-or-list))) |
| 694 | (goto-char beg) | 694 | (progn |
| 695 | (forward-line 1) | 695 | (goto-char beg) |
| 696 | (skip-chars-forward "^ \t") | 696 | (forward-line 1) |
| 697 | (forward-word 2) | 697 | (skip-chars-forward "^ \t") |
| 698 | (skip-chars-forward " \t") | 698 | (forward-word 2) |
| 699 | (delete-region beg (point)) | 699 | (skip-chars-forward " \t") |
| 700 | (forward-word 1) | 700 | (delete-region beg (point)) |
| 701 | (delete-region (point) | 701 | (forward-word 1) |
| 702 | (progn (forward-line 1) (point)))) | 702 | (delete-region (point) |
| 703 | ;; The dired-free-space-program failed; delete its output | 703 | (progn (forward-line 1) (point)))) |
| 704 | (delete-region (- beg 7) (point)))))))) | 704 | ;; The dired-free-space-program failed; delete its output |
| 705 | (delete-region (- beg 7) (point))) | ||
| 706 | (error (delete-region (- beg 7) (point))))))))) | ||
| 705 | ;; Quote certain characters, unless ls quoted them for us. | 707 | ;; Quote certain characters, unless ls quoted them for us. |
| 706 | (if (not (string-match "b" dired-actual-switches)) | 708 | (if (not (string-match "b" dired-actual-switches)) |
| 707 | (save-excursion | 709 | (save-excursion |