From 7f4d4a978d1c7357177494cb8297873f28bd73b1 Mon Sep 17 00:00:00 2001 From: Michael Albinus Date: Sat, 26 Dec 2009 20:04:43 +0000 Subject: [PATCH] * net/tramp.el (tramp-handle-insert-directory): Quote "'" in the switches. Check also for //SUBDIRED// line. --- lisp/ChangeLog | 5 +++++ lisp/net/tramp.el | 6 +++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index c5b6c6a82f0..5783c211812 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2009-12-26 Michael Albinus + + * net/tramp.el (tramp-handle-insert-directory): Quote "'" in the + switches. Check also for //SUBDIRED// line. + 2009-12-23 Vinicius Jose Latorre * ps-print.el (ps-face-attributes): It was not returning the diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el index 8a5d1f8c413..017a55821af 100644 --- a/lisp/net/tramp.el +++ b/lisp/net/tramp.el @@ -38,7 +38,7 @@ ;; ;; This package only works for Emacs 21.1 and higher, and for XEmacs 21.4 ;; and higher. For XEmacs 21, you need the package `fsf-compat' for -;; the `with-timeout' macro.) +;; the `with-timeout' macro. ;; ;; Also see the todo list at the bottom of this file. ;; @@ -4079,6 +4079,8 @@ This is like `dired-recursive-delete-directory' for Tramp files." (setq switches (concat "-d " switches))) (when wildcard (setq switches (concat switches " " wildcard))) + (when (string-match "'" switches) + (setq switches (replace-match "\\\\'" nil nil switches))) ;; If `full-directory-p', we just say `ls -l FILENAME'. ;; Else we chdir to the parent directory, then say `ls -ld BASENAME'. (if full-directory-p @@ -4121,6 +4123,8 @@ This is like `dired-recursive-delete-directory' for Tramp files." ;; Check for "--dired" output. (forward-line -2) + (when (looking-at "//SUBDIRED//") + (forward-line -1)) (when (looking-at "//DIRED//") (let ((end (tramp-compat-line-end-position)) (linebeg (point))) -- 2.39.5