diff options
| author | Michael Albinus | 2013-02-26 09:46:38 +0100 |
|---|---|---|
| committer | Michael Albinus | 2013-02-26 09:46:38 +0100 |
| commit | 58bd4aa21a6847c0d32cac42ce3085082ef8bcb3 (patch) | |
| tree | bb44bfcdb7ca2ac86d7499d68795e144a070dc9a /lisp | |
| parent | ecc0fdd49ea4351c229f7db243d26360604e758c (diff) | |
| download | emacs-58bd4aa21a6847c0d32cac42ce3085082ef8bcb3.tar.gz emacs-58bd4aa21a6847c0d32cac42ce3085082ef8bcb3.zip | |
* net/tramp-sh.el (tramp-sh-handle-insert-directory): Add
"2>/dev/null" to the ls command, in case "en_US.utf8" is not
defined. POSIX environments fall back to the "C" locale then and
emit a warning, which shall be suppressed.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 7 | ||||
| -rw-r--r-- | lisp/net/tramp-sh.el | 6 |
2 files changed, 10 insertions, 3 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 72a7d11eaa2..c5a902d6442 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,10 @@ | |||
| 1 | 2013-02-26 Michael Albinus <michael.albinus@gmx.de> | ||
| 2 | |||
| 3 | * net/tramp-sh.el (tramp-sh-handle-insert-directory): Add | ||
| 4 | "2>/dev/null" to the ls command, in case "en_US.utf8" is not | ||
| 5 | defined. POSIX environments fall back to the "C" locale then and | ||
| 6 | emit a warning, which shall be suppressed. | ||
| 7 | |||
| 1 | 2013-02-26 Stefan Monnier <monnier@iro.umontreal.ca> | 8 | 2013-02-26 Stefan Monnier <monnier@iro.umontreal.ca> |
| 2 | 9 | ||
| 3 | * emacs-lisp/easy-mmode.el (define-globalized-minor-mode): Tweak logic. | 10 | * emacs-lisp/easy-mmode.el (define-globalized-minor-mode): Tweak logic. |
diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el index e63acb6b40e..e2aaafb38dd 100644 --- a/lisp/net/tramp-sh.el +++ b/lisp/net/tramp-sh.el | |||
| @@ -2593,12 +2593,12 @@ This is like `dired-recursive-delete-directory' for Tramp files." | |||
| 2593 | ;; If `full-directory-p', we just say `ls -l FILENAME'. | 2593 | ;; If `full-directory-p', we just say `ls -l FILENAME'. |
| 2594 | ;; Else we chdir to the parent directory, then say `ls -ld BASENAME'. | 2594 | ;; Else we chdir to the parent directory, then say `ls -ld BASENAME'. |
| 2595 | ;; "--dired" returns byte positions. Therefore, the file names | 2595 | ;; "--dired" returns byte positions. Therefore, the file names |
| 2596 | ;; must be encoded, which is guaranteed by "LC_ALL=en_US.UTF8 | 2596 | ;; must be encoded, which is guaranteed by "LC_ALL=en_US.utf8 |
| 2597 | ;; LC_CTYPE=''". | 2597 | ;; LC_CTYPE=''". |
| 2598 | (if full-directory-p | 2598 | (if full-directory-p |
| 2599 | (tramp-send-command | 2599 | (tramp-send-command |
| 2600 | v | 2600 | v |
| 2601 | (format "env LC_ALL=en_US.UTF8 LC_CTYPE='' %s %s %s 2>/dev/null" | 2601 | (format "env LC_ALL=en_US.utf8 LC_CTYPE='' %s %s %s 2>/dev/null" |
| 2602 | (tramp-get-ls-command v) | 2602 | (tramp-get-ls-command v) |
| 2603 | switches | 2603 | switches |
| 2604 | (if wildcard | 2604 | (if wildcard |
| @@ -2614,7 +2614,7 @@ This is like `dired-recursive-delete-directory' for Tramp files." | |||
| 2614 | (tramp-run-real-handler 'file-name-directory (list localname)))) | 2614 | (tramp-run-real-handler 'file-name-directory (list localname)))) |
| 2615 | (tramp-send-command | 2615 | (tramp-send-command |
| 2616 | v | 2616 | v |
| 2617 | (format "env LC_ALL=en_US.UTF8 LC_CTYPE='' %s %s %s" | 2617 | (format "env LC_ALL=en_US.utf8 LC_CTYPE='' %s %s %s 2>/dev/null" |
| 2618 | (tramp-get-ls-command v) | 2618 | (tramp-get-ls-command v) |
| 2619 | switches | 2619 | switches |
| 2620 | (if (or wildcard | 2620 | (if (or wildcard |