aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Albinus2015-12-18 17:45:24 +0100
committerMichael Albinus2015-12-18 17:45:24 +0100
commit81e523fc4d3dcb0cf59a69f45786d2691f982695 (patch)
tree65a5e2ad015270804d1b5cc6aaef891ff6ebb4e7
parentdfc850ba4ce229136b2f183574c030120d320d19 (diff)
downloademacs-81e523fc4d3dcb0cf59a69f45786d2691f982695.tar.gz
emacs-81e523fc4d3dcb0cf59a69f45786d2691f982695.zip
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.
-rw-r--r--lisp/net/tramp-sh.el2
-rw-r--r--lisp/net/tramp.el4
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."
1274 (tramp-get-test-command vec) 1274 (tramp-get-test-command vec)
1275 (tramp-shell-quote-argument localname) 1275 (tramp-shell-quote-argument localname)
1276 (tramp-get-ls-command vec) 1276 (tramp-get-ls-command vec)
1277 (if (eq id-format 'integer) "-ildn" "-ild")
1277 ;; On systems which have no quoting style, file names 1278 ;; On systems which have no quoting style, file names
1278 ;; with special characters could fail. 1279 ;; with special characters could fail.
1279 (cond 1280 (cond
@@ -1282,7 +1283,6 @@ target of the symlink differ."
1282 ((tramp-get-ls-command-with-w-option vec) 1283 ((tramp-get-ls-command-with-w-option vec)
1283 "-w") 1284 "-w")
1284 (t "")) 1285 (t ""))
1285 (if (eq id-format 'integer) "-ildn" "-ild")
1286 (tramp-shell-quote-argument localname))) 1286 (tramp-shell-quote-argument localname)))
1287 ;; Parse `ls -l' output ... 1287 ;; Parse `ls -l' output ...
1288 (with-current-buffer (tramp-get-buffer vec) 1288 (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'."
1291 1291
1292(defun tramp-dissect-file-name (name &optional nodefault) 1292(defun tramp-dissect-file-name (name &optional nodefault)
1293 "Return a `tramp-file-name' structure. 1293 "Return a `tramp-file-name' structure.
1294The structure consists of remote method, remote user, remote host 1294The structure consists of remote method, remote user, remote host,
1295and localname (file name on remote host). If NODEFAULT is 1295localname (file name on remote host) and hop. If NODEFAULT is
1296non-nil, the file name parts are not expanded to their default 1296non-nil, the file name parts are not expanded to their default
1297values." 1297values."
1298 (save-match-data 1298 (save-match-data