diff options
| author | Richard M. Stallman | 1994-04-01 18:51:17 +0000 |
|---|---|---|
| committer | Richard M. Stallman | 1994-04-01 18:51:17 +0000 |
| commit | 60e4eb54299120df58a837874df32fde0126e286 (patch) | |
| tree | a3bea0a62bfc8f3e4a043c3ee7336f0dbc961bd7 | |
| parent | a0e9c22aad115544aeba583094bd5e4f4e13cf8f (diff) | |
| download | emacs-60e4eb54299120df58a837874df32fde0126e286.tar.gz emacs-60e4eb54299120df58a837874df32fde0126e286.zip | |
(dired-add-entry, dired-insert-subdir-doinsert):
Call dired-insert-set-properties.
(dired-add-entry): Don't make name absolute; bind default-directory.
| -rw-r--r-- | lisp/dired-aux.el | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/lisp/dired-aux.el b/lisp/dired-aux.el index 0959ee0f1d4..b01ba220433 100644 --- a/lisp/dired-aux.el +++ b/lisp/dired-aux.el | |||
| @@ -769,12 +769,14 @@ a prefix arg lets you edit the `ls' switches used for the new listing." | |||
| 769 | ;; not found | 769 | ;; not found |
| 770 | (throw 'not-found "Subdir not found"))) | 770 | (throw 'not-found "Subdir not found"))) |
| 771 | ;; found and point is at The Right Place: | 771 | ;; found and point is at The Right Place: |
| 772 | (let (buffer-read-only) | 772 | (let (buffer-read-only (opoint (point))) |
| 773 | (beginning-of-line) | 773 | (beginning-of-line) |
| 774 | (dired-add-entry-do-indentation marker-char) | 774 | (dired-add-entry-do-indentation marker-char) |
| 775 | ;; don't expand `.' ! | 775 | ;; don't expand `.' ! |
| 776 | (insert-directory (dired-make-absolute filename directory) | 776 | (let ((default-directory directory)) |
| 777 | (concat dired-actual-switches "d")) | 777 | (insert-directory filename |
| 778 | (concat dired-actual-switches "d"))) | ||
| 779 | (dired-insert-set-properties opoint (point)) | ||
| 778 | (forward-line -1) | 780 | (forward-line -1) |
| 779 | ;; We want to have the non-directory part, only: | 781 | ;; We want to have the non-directory part, only: |
| 780 | (let* ((beg (dired-move-to-filename t)) ; error for strange output | 782 | (let* ((beg (dired-move-to-filename t)) ; error for strange output |
| @@ -1592,7 +1594,9 @@ This function takes some pains to conform to `ls -lR' output." | |||
| 1592 | (if (equal dirname (car (car (reverse dired-subdir-alist)))) | 1594 | (if (equal dirname (car (car (reverse dired-subdir-alist)))) |
| 1593 | ;; top level directory may contain wildcards: | 1595 | ;; top level directory may contain wildcards: |
| 1594 | (dired-readin-insert dired-directory) | 1596 | (dired-readin-insert dired-directory) |
| 1595 | (insert-directory dirname dired-actual-switches nil t))) | 1597 | (let ((opoint (point))) |
| 1598 | (insert-directory dirname dired-actual-switches nil t) | ||
| 1599 | (dired-insert-set-properties opoint (point))))) | ||
| 1596 | (message "Reading directory %s...done" dirname) | 1600 | (message "Reading directory %s...done" dirname) |
| 1597 | (setq end (point-marker)) | 1601 | (setq end (point-marker)) |
| 1598 | (indent-rigidly begin end 2) | 1602 | (indent-rigidly begin end 2) |