Mercurial > emacs
comparison lisp/files.el @ 107145:541b767fb366
* 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)
author | Michael Albinus <albinus@detlef> |
---|---|
date | Sun, 14 Feb 2010 10:23:52 +0100 |
parents | 405563a1dc5c |
children | 8554c569b8fd |
comparison
equal
deleted
inserted
replaced
107144:0811f079d15e | 107145:541b767fb366 |
---|---|
5697 ;; use them explicitly to quote | 5697 ;; use them explicitly to quote |
5698 ;; wildcard characters. | 5698 ;; wildcard characters. |
5699 (shell-quote-wildcard-pattern pattern)))) | 5699 (shell-quote-wildcard-pattern pattern)))) |
5700 ;; SunOS 4.1.3, SVr4 and others need the "." to list the | 5700 ;; SunOS 4.1.3, SVr4 and others need the "." to list the |
5701 ;; directory if FILE is a symbolic link. | 5701 ;; directory if FILE is a symbolic link. |
5702 (unless full-directory-p | |
5703 (setq switches | |
5704 (if (stringp switches) | |
5705 (concat switches " -d") | |
5706 (add-to-list 'switches "-d" 'append)))) | |
5702 (apply 'call-process | 5707 (apply 'call-process |
5703 insert-directory-program nil t nil | 5708 insert-directory-program nil t nil |
5704 (append | 5709 (append |
5705 (if (listp switches) switches | 5710 (if (listp switches) switches |
5706 (unless (equal switches "") | 5711 (unless (equal switches "") |