summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard M. Stallman <rms@gnu.org>1994-04-01 18:51:17 +0000
committerRichard M. Stallman <rms@gnu.org>1994-04-01 18:51:17 +0000
commit60e4eb54299120df58a837874df32fde0126e286 (patch)
treea3bea0a62bfc8f3e4a043c3ee7336f0dbc961bd7
parenta0e9c22aad115544aeba583094bd5e4f4e13cf8f (diff)
downloademacs-60e4eb54299120df58a837874df32fde0126e286.tar.gz
(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.el12
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."
;; not found
(throw 'not-found "Subdir not found")))
;; found and point is at The Right Place:
- (let (buffer-read-only)
+ (let (buffer-read-only (opoint (point)))
(beginning-of-line)
(dired-add-entry-do-indentation marker-char)
;; don't expand `.' !
- (insert-directory (dired-make-absolute filename directory)
- (concat dired-actual-switches "d"))
+ (let ((default-directory directory))
+ (insert-directory filename
+ (concat dired-actual-switches "d")))
+ (dired-insert-set-properties opoint (point))
(forward-line -1)
;; We want to have the non-directory part, only:
(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."
(if (equal dirname (car (car (reverse dired-subdir-alist))))
;; top level directory may contain wildcards:
(dired-readin-insert dired-directory)
- (insert-directory dirname dired-actual-switches nil t)))
+ (let ((opoint (point)))
+ (insert-directory dirname dired-actual-switches nil t)
+ (dired-insert-set-properties opoint (point)))))
(message "Reading directory %s...done" dirname)
(setq end (point-marker))
(indent-rigidly begin end 2)