diff options
| author | Michael Albinus | 2008-04-24 19:37:01 +0000 |
|---|---|---|
| committer | Michael Albinus | 2008-04-24 19:37:01 +0000 |
| commit | 4ad216352ee53ebd69a6ee611d1a99a2539fb886 (patch) | |
| tree | 15b6a313d34d29cb6b5842f9e5d5dc4f0a276830 | |
| parent | 800aaa8910e7f2ba2a47a7aafa83206af8ba5ba9 (diff) | |
| download | emacs-4ad216352ee53ebd69a6ee611d1a99a2539fb886.tar.gz emacs-4ad216352ee53ebd69a6ee611d1a99a2539fb886.zip | |
* net/tramp.el (tramp-get-remote-stat): Test whether stat supports
%s. Reported by Loris Bennett <loris.bennett@fu-berlin.de>.
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/net/tramp.el | 8 |
2 files changed, 10 insertions, 3 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 1ffbaf87b9a..e192817bd84 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2008-04-24 Michael Albinus <michael.albinus@gmx.de> | ||
| 2 | |||
| 3 | * net/tramp.el (tramp-get-remote-stat): Test whether stat supports | ||
| 4 | %s. Reported by Loris Bennett <loris.bennett@fu-berlin.de>. | ||
| 5 | |||
| 1 | 2008-04-24 Sam Steingold <sds@gnu.org> | 6 | 2008-04-24 Sam Steingold <sds@gnu.org> |
| 2 | 7 | ||
| 3 | * textmodes/remember.el (remember-diary-extract-entries): Use | 8 | * textmodes/remember.el (remember-diary-extract-entries): Use |
diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el index 5f8f126b4be..a3053f73ded 100644 --- a/lisp/net/tramp.el +++ b/lisp/net/tramp.el | |||
| @@ -6965,17 +6965,19 @@ necessary only. This function will be used in file name completion." | |||
| 6965 | (let ((result (tramp-find-executable | 6965 | (let ((result (tramp-find-executable |
| 6966 | vec "stat" (tramp-get-remote-path vec))) | 6966 | vec "stat" (tramp-get-remote-path vec))) |
| 6967 | tmp) | 6967 | tmp) |
| 6968 | ;; Check whether stat(1) returns usable syntax. | 6968 | ;; Check whether stat(1) returns usable syntax. %s does not |
| 6969 | ;; work on older AIX systems. | ||
| 6969 | (when result | 6970 | (when result |
| 6970 | (setq tmp | 6971 | (setq tmp |
| 6971 | ;; We don't want to display an error message. | 6972 | ;; We don't want to display an error message. |
| 6972 | (with-temp-message (or (current-message) "") | 6973 | (with-temp-message (or (current-message) "") |
| 6973 | (condition-case nil | 6974 | (condition-case nil |
| 6974 | (tramp-send-command-and-read | 6975 | (tramp-send-command-and-read |
| 6975 | vec (format "%s -c '(\"%%N\")' /" result)) | 6976 | vec (format "%s -c '(\"%%N\" %%s)' /" result)) |
| 6976 | (error nil)))) | 6977 | (error nil)))) |
| 6977 | (unless (and (listp tmp) (stringp (car tmp)) | 6978 | (unless (and (listp tmp) (stringp (car tmp)) |
| 6978 | (string-match "^./.$" (car tmp))) | 6979 | (string-match "^./.$" (car tmp)) |
| 6980 | (integerp (cadr tmp))) | ||
| 6979 | (setq result nil))) | 6981 | (setq result nil))) |
| 6980 | result)))) | 6982 | result)))) |
| 6981 | 6983 | ||