comparison lisp/net/tramp-smb.el @ 107085:d7831d04952b

* dired.el (dired-revert): If DIRED-DIRECTORY is a cons cell, call `dired-uncache' for every elemnt which is an absolute file name. * net/tramp.el (tramp-handle-dired-uncache): When DIR is not a directory, handle its directory component. (tramp-handle-file-remote-p): Let-bind `tramp-verbose' to 3; this function is called permanently and creates noise, otherwise. * net/tramp-imap.el (tramp-imap-handle-insert-directory): * net/tramp-smb.el (tramp-smb-handle-insert-directory): Handle the case, FILENAME is not in `default-directory'. (Bug#5478)
author Michael Albinus <michael.albinus@gmx.de>
date Thu, 04 Feb 2010 17:25:57 +0100
parents 5071660bbec4
children 2e763e444bc2
comparison
equal deleted inserted replaced
107084:316cee8951ad 107085:d7831d04952b
714 (when (not (zerop (length (nth 0 x)))) 714 (when (not (zerop (length (nth 0 x))))
715 (let ((attr 715 (let ((attr
716 (when (tramp-smb-get-stat-capability v) 716 (when (tramp-smb-get-stat-capability v)
717 (ignore-errors 717 (ignore-errors
718 (file-attributes 718 (file-attributes
719 (expand-file-name (nth 0 x)) 'string))))) 719 (expand-file-name (nth 0 x) filename) 'string)))))
720 (insert 720 (insert
721 (format 721 (format
722 "%10s %3d %-8s %-8s %8s %s " 722 "%10s %3d %-8s %-8s %8s %s "
723 (or (nth 8 attr) (nth 1 x)) ; mode 723 (or (nth 8 attr) (nth 1 x)) ; mode
724 (or (nth 1 attr) 1) ; inode 724 (or (nth 1 attr) 1) ; inode
730 (tramp-time-subtract (current-time) (nth 3 x)) 730 (tramp-time-subtract (current-time) (nth 3 x))
731 tramp-half-a-year) 731 tramp-half-a-year)
732 "%b %e %R" 732 "%b %e %R"
733 "%b %e %Y") 733 "%b %e %Y")
734 (nth 3 x)))) ; date 734 (nth 3 x)))) ; date
735 ;; We mark the filename. 735 ;; We mark the file name. The inserted name could be
736 ;; from somewhere else, so we use the relative file
737 ;; name of `default-directory'.
736 (let ((start (point))) 738 (let ((start (point)))
737 (insert (format "%s\n" (nth 0 x))) ; file name 739 (insert
740 (format
741 "%s\n"
742 (file-relative-name (expand-file-name (nth 0 x) filename))))
738 (put-text-property start (1- (point)) 'dired-filename t)) 743 (put-text-property start (1- (point)) 'dired-filename t))
739 (forward-line) 744 (forward-line)
740 (beginning-of-line)))) 745 (beginning-of-line))))
741 entries))))) 746 entries)))))
742 747