[Emacs-diffs] /srv/bzr/emacs/trunk r111425: * net/tramp-adb.el (tramp-do-parse-file-attributes-with-ls):

[Michael Albinus]

------------------------------------------------------------
revno: 111425
committer: Michael Albinus <address@hidden>
branch nick: trunk
timestamp: Sat 2013-01-05 14:48:16 +0100
message:
  * net/tramp-adb.el (tramp-do-parse-file-attributes-with-ls):
  (tramp-adb-handle-directory-files-and-attributes): Fix typos.
modified:
  lisp/ChangeLog
  lisp/net/tramp-adb.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2013-01-05 13:41:57 +0000
+++ b/lisp/ChangeLog    2013-01-05 13:48:16 +0000
@@ -1,3 +1,8 @@
+2013-01-05  Michael Albinus  <address@hidden>
+
+       * net/tramp-adb.el (tramp-do-parse-file-attributes-with-ls):
+       (tramp-adb-handle-directory-files-and-attributes): Fix typos.
+
 2013-01-05  Jürgen Hötzel  <address@hidden>
 
        * net/tramp-adb.el (tramp-adb-handle-file-attributes): More robust

=== modified file 'lisp/net/tramp-adb.el'
--- a/lisp/net/tramp-adb.el     2013-01-05 13:41:57 +0000
+++ b/lisp/net/tramp-adb.el     2013-01-05 13:48:16 +0000
@@ -325,7 +325,7 @@
                 mod-string
                 ;; fake
                 t 1
-                (tramp-get-device v))
+                (tramp-get-device vec))
                file-properties)))
       file-properties)))
 
@@ -335,7 +335,7 @@
   (when (file-directory-p directory)
     (with-parsed-tramp-file-name (expand-file-name directory) nil
       (with-tramp-file-property
-         v localname (format "directory-files-attributes-%s-%s-%s-s"
+         v localname (format "directory-files-attributes-%s-%s-%s-%s"
                              full match id-format nosort)
        (tramp-adb-barf-unless-okay
         v (format "%s -a -l %s"
@@ -343,13 +343,17 @@
                   (tramp-shell-quote-argument localname)) "")
        (with-current-buffer (tramp-get-buffer v)
          (tramp-adb-sh-fix-ls-output)
-         (let ((result (tramp-do-parse-file-attributes-with-ls v (or id-format 
'integer))))
+         (let ((result (tramp-do-parse-file-attributes-with-ls
+                        v (or id-format 'integer))))
            (when full
-             (setq result (mapcar
-                           (lambda (x) (cons (expand-file-name (car x) 
directory) (cdr x)))
-                           result)))
+             (setq result
+                   (mapcar
+                    (lambda (x)
+                      (cons (expand-file-name (car x) directory) (cdr x)))
+                    result)))
            (unless nosort
-             (setq result (sort result (lambda (x y) (string< (car x) (car 
y))))))
+             (setq result
+                   (sort result (lambda (x y) (string< (car x) (car y))))))
            (delq nil
                  (mapcar (lambda (x)
                            (if (or (not match) (string-match match (car x)))