* net/tramp-fish.el (tramp-fish-handle-delete-directory): Handle

optional parameter RECURSIVE.

diff --git a/lisp/net/tramp-fish.el b/lisp/net/tramp-fish.el
index aedae8797e14c344ccb27bdc2c6c3c56e57de694..215ada5d2343f28914f4c569f080ab866820c7da 100644 (file)
--- a/lisp/net/tramp-fish.el
+++ b/lisp/net/tramp-fish.el
@@ -312,10 +312,19 @@ pass to the OPERATION."
   (tramp-fish-do-copy-or-rename-file
    'copy filename newname ok-if-already-exists keep-date preserve-uid-gid))
 
-(defun tramp-fish-handle-delete-directory (directory)
+(defun tramp-fish-handle-delete-directory (directory &optional recursive)
   "Like `delete-directory' for Tramp files."
   (when (file-exists-p directory)
-    (with-parsed-tramp-file-name
+    (if recursive
+       (mapc
+        (lambda (file)
+          (if (file-directory-p file)
+              (delete-directory file recursive)
+            (delete-file file)))
+        ;; We do not want to delete "." and "..".
+        (directory-files
+         directory 'full "^\\([^.]\\|\\.\\([^.]\\|\\..\\)\\).*")))
+     (with-parsed-tramp-file-name
        (directory-file-name (expand-file-name directory)) nil
       (tramp-flush-directory-property v localname)
       (tramp-fish-send-command-and-check v (format "#RMD %s" localname)))))