aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Albinus2009-09-04 08:14:30 +0000
committerMichael Albinus2009-09-04 08:14:30 +0000
commit7ba1d9c24dcd163aaabedf92dd766c2100439dbd (patch)
treeaf86818a71e6fe29b715fc2b28f665cb1d31c4f3
parent67d110f1a902687a2225575fb3927924b2a511a7 (diff)
downloademacs-7ba1d9c24dcd163aaabedf92dd766c2100439dbd.tar.gz
emacs-7ba1d9c24dcd163aaabedf92dd766c2100439dbd.zip
* net/tramp.el (tramp-handle-insert-directory): Handle "--dired"
also when adding a new directory.
-rw-r--r--lisp/net/tramp.el9
1 files changed, 3 insertions, 6 deletions
diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index 2586542b656..4a860dbb9f5 100644
--- a/lisp/net/tramp.el
+++ b/lisp/net/tramp.el
@@ -3761,10 +3761,9 @@ This is like `dired-recursive-delete-directory' for Tramp files."
3761 (buffer-string))) 3761 (buffer-string)))
3762 3762
3763 ;; Check for "--dired" output. 3763 ;; Check for "--dired" output.
3764 (goto-char (point-max))
3765 (forward-line -2) 3764 (forward-line -2)
3766 (when (looking-at "//DIRED//") 3765 (when (looking-at "//DIRED//")
3767 (let ((end (line-end-position)) 3766 (let ((end (tramp-compat-line-end-position))
3768 (linebeg (point))) 3767 (linebeg (point)))
3769 ;; Now read the numeric positions of file names. 3768 ;; Now read the numeric positions of file names.
3770 (goto-char linebeg) 3769 (goto-char linebeg)
@@ -3777,12 +3776,10 @@ This is like `dired-recursive-delete-directory' for Tramp files."
3777 ;; End is followed by \n or by " -> ". 3776 ;; End is followed by \n or by " -> ".
3778 (put-text-property start end 'dired-filename t))))) 3777 (put-text-property start end 'dired-filename t)))))
3779 ;; Reove training lines. 3778 ;; Reove training lines.
3780 (goto-char (point-max)) 3779 (goto-char (tramp-compat-line-beginning-position))
3781 (forward-line -1)
3782 (while (looking-at "//") 3780 (while (looking-at "//")
3783 (forward-line 1) 3781 (forward-line 1)
3784 (delete-region (match-beginning 0) (point)) 3782 (delete-region (match-beginning 0) (point)))))
3785 (forward-line -1))))
3786 (goto-char (point-max))))) 3783 (goto-char (point-max)))))
3787 3784
3788(defun tramp-handle-unhandled-file-name-directory (filename) 3785(defun tramp-handle-unhandled-file-name-directory (filename)