From 81e523fc4d3dcb0cf59a69f45786d2691f982695 Mon Sep 17 00:00:00 2001 From: Michael Albinus Date: Fri, 18 Dec 2015 17:45:24 +0100 Subject: [PATCH] Minor fixes in Tramp * lisp/net/tramp-sh.el (tramp-do-file-attributes-with-ls): Reorder ls arguments. * lisp/net/tramp.el (tramp-dissect-file-name): Fix docstring. --- lisp/net/tramp-sh.el | 2 +- lisp/net/tramp.el | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el index 6cd29c1ca6c..95fafb848d9 100644 --- a/lisp/net/tramp-sh.el +++ b/lisp/net/tramp-sh.el @@ -1274,6 +1274,7 @@ target of the symlink differ." (tramp-get-test-command vec) (tramp-shell-quote-argument localname) (tramp-get-ls-command vec) + (if (eq id-format 'integer) "-ildn" "-ild") ;; On systems which have no quoting style, file names ;; with special characters could fail. (cond @@ -1282,7 +1283,6 @@ target of the symlink differ." ((tramp-get-ls-command-with-w-option vec) "-w") (t "")) - (if (eq id-format 'integer) "-ildn" "-ild") (tramp-shell-quote-argument localname))) ;; Parse `ls -l' output ... (with-current-buffer (tramp-get-buffer vec) diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el index 40c3f368a9f..b7f53095a8e 100644 --- a/lisp/net/tramp.el +++ b/lisp/net/tramp.el @@ -1291,8 +1291,8 @@ This is HOST, if non-nil. Otherwise, it is `tramp-default-host'." (defun tramp-dissect-file-name (name &optional nodefault) "Return a `tramp-file-name' structure. -The structure consists of remote method, remote user, remote host -and localname (file name on remote host). If NODEFAULT is +The structure consists of remote method, remote user, remote host, +localname (file name on remote host) and hop. If NODEFAULT is non-nil, the file name parts are not expanded to their default values." (save-match-data -- 2.39.2