diff options
| author | Michael Albinus <albinus@detlef> | 2010-02-14 10:23:52 +0100 |
|---|---|---|
| committer | Michael Albinus <albinus@detlef> | 2010-02-14 10:23:52 +0100 |
| commit | ecbaeb7bf5fd06f67347240a19b054a7a3698708 (patch) | |
| tree | f88b19ffe803ed292963f3aebbef40a8d6444c02 /lisp/files.el | |
| parent | 91e3333fc5d5a23ee763a5f0a3440c27eb62a6f1 (diff) | |
| download | emacs-ecbaeb7bf5fd06f67347240a19b054a7a3698708.tar.gz | |
* files.el (insert-directory): When WILDCARD-REGEXP and
FULL-DIRECTORY-P are nil, insert the file entry instead of the
whole directory. (Bug#5551)
* net/ange-ftp.el (ange-ftp-insert-directory): Insert " " for
dired's alignment sanity. (Bug#5516)
Diffstat (limited to 'lisp/files.el')
| -rw-r--r-- | lisp/files.el | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/lisp/files.el b/lisp/files.el index d372ff3420a..41cddcd4f62 100644 --- a/lisp/files.el +++ b/lisp/files.el @@ -5699,6 +5699,11 @@ normally equivalent short `-D' option is just passed on to (shell-quote-wildcard-pattern pattern)))) ;; SunOS 4.1.3, SVr4 and others need the "." to list the ;; directory if FILE is a symbolic link. + (unless full-directory-p + (setq switches + (if (stringp switches) + (concat switches " -d") + (add-to-list 'switches "-d" 'append)))) (apply 'call-process insert-directory-program nil t nil (append |