>From d80b45f0a9ec912a55f952cda5cc5ee53f72ac50 Mon Sep 17 00:00:00 2001
From: Michael Albinus <address@hidden>
Date: Tue, 31 May 2011 14:13:12 +0200
Subject: [PATCH 9/9] Make `tramp-adb-handle-insert-directory' capable to insert partial directory listings.

---
 tramp-adb.el |   59 ++++++++++++++++++++++++++++++++-------------------------
 1 files changed, 33 insertions(+), 26 deletions(-)

diff --git a/tramp-adb.el b/tramp-adb.el
index 03f6b31..991567a 100644
--- a/tramp-adb.el
+++ b/tramp-adb.el
@@ -290,13 +290,18 @@ pass to the OPERATION."
 
 (defun tramp-adb--gnu-switches-to-ash
   (switches)
-  "Almquist shell can't handle multiple arguments. Convert (\"-al\") to (\"-a\" \"-l\")"
-  (split-string (apply 'concat (mapcar (lambda (s)
-					 (replace-regexp-in-string "\\(.\\)"  " -\\1"
-								   (replace-regexp-in-string "^-" "" s)))
-				       ;; FIXME: Warning about removed switches (long and non-dash)
-				       (remove-if (lambda (s)
-						    (string-match  "\\(^--\\|^[^-]\\)" s)) switches)))))
+  "Almquist shell can't handle multiple arguments.
+Convert (\"-al\") to (\"-a\" \"-l\").  Remove arguments like \"--dired\"."
+  (split-string
+   (apply 'concat
+	  (mapcar (lambda (s)
+		    (replace-regexp-in-string
+		     "\\(.\\)"  " -\\1"
+		     (replace-regexp-in-string "^-" "" s)))
+		  ;; FIXME: Warning about removed switches (long and non-dash).
+		  (remove-if
+		   (lambda (s) (string-match "\\(^--\\|^[^-]\\)" s))
+		   switches)))))
 
 (defun tramp-adb-handle-insert-directory
   (filename switches &optional wildcard full-directory-p)
@@ -304,25 +309,27 @@ pass to the OPERATION."
   (when (stringp switches)
     (setq switches (tramp-adb--gnu-switches-to-ash (split-string switches))))
   (with-parsed-tramp-file-name (expand-file-name filename) nil
-    (let ((name (tramp-shell-quote-argument (directory-file-name localname)))
-	  (switch-d (member "-d" switches))
-	  (switch-t (member "-t" switches))
-	  (switches (mapconcat 'identity (remove "-t" switches) " ")))
-      (tramp-adb-barf-unless-okay
-       v (format "ls %s %s" switches name)
-       "Cannot insert directory listing: %s" filename)
-      (insert (with-current-buffer (tramp-get-buffer v) (buffer-string)))
-      (unless  switch-d
-	;; We insert also filename/. and filename/.., because "ls" doesn't.
-	(ignore-errors
-	  (tramp-adb-barf-unless-okay
-	   v (format "ls -d %s %s %s"
-		     switches
-		     (concat (file-name-as-directory name) ".")
-		     (concat (file-name-as-directory name) ".."))
-	   "Cannot insert directory listing: %s" filename)
-	  (insert (with-current-buffer (tramp-get-buffer v) (buffer-string)))))
-      (tramp-adb-sh-fix-ls-output switch-t))))
+    (with-current-buffer (tramp-get-buffer v)
+      (let ((name (tramp-shell-quote-argument (directory-file-name localname)))
+	    (switch-d (member "-d" switches))
+	    (switch-t (member "-t" switches))
+	    (switches (mapconcat 'identity (remove "-t" switches) " ")))
+	(tramp-adb-barf-unless-okay
+	 v (format "ls %s %s" switches name)
+	 "Cannot insert directory listing: %s" filename)
+	(unless switch-d
+	  ;; We insert also filename/. and filename/.., because "ls" doesn't.
+	  (narrow-to-region (point) (point))
+	  (ignore-errors
+	    (tramp-adb-barf-unless-okay
+	     v (format "ls -d %s %s %s"
+		       switches
+		       (concat (file-name-as-directory name) ".")
+		       (concat (file-name-as-directory name) ".."))
+	     "Cannot insert directory listing: %s" filename))
+	  (widen))
+	(tramp-adb-sh-fix-ls-output switch-t)))
+    (insert-buffer-substring (tramp-get-buffer v))))
 
 (defun tramp-adb-sh-fix-ls-output (&optional sort-by-time)
   "Androids ls command doesn't insert size column for directories: Emacs dired can't find files. Insert dummy 0 in empty size columns."
-- 
1.7.4.1