* 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.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 72a7d11eaa27223476c649285bd73390a3cb8952..c5a902d644286aa7e7328b8d8c997621d4e4758d 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
+2013-02-26  Michael Albinus  <michael.albinus@gmx.de>
+
+       * 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.
+
 2013-02-26  Stefan Monnier  <monnier@iro.umontreal.ca>
 
        * 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 e63acb6b40eced72629234551ec8515dafd85dc0..e2aaafb38dd7318b4d932e80ddf2e8361e10944b 100644 (file)
--- 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."
       ;; If `full-directory-p', we just say `ls -l FILENAME'.
       ;; Else we chdir to the parent directory, then say `ls -ld BASENAME'.
       ;; "--dired" returns byte positions.  Therefore, the file names
-      ;; must be encoded, which is guaranteed by "LC_ALL=en_US.UTF8
+      ;; must be encoded, which is guaranteed by "LC_ALL=en_US.utf8
       ;; LC_CTYPE=''".
       (if full-directory-p
          (tramp-send-command
           v
-          (format "env LC_ALL=en_US.UTF8 LC_CTYPE='' %s %s %s 2>/dev/null"
+          (format "env LC_ALL=en_US.utf8 LC_CTYPE='' %s %s %s 2>/dev/null"
                   (tramp-get-ls-command v)
                   switches
                   (if wildcard
@@ -2614,7 +2614,7 @@ This is like `dired-recursive-delete-directory' for Tramp files."
          (tramp-run-real-handler 'file-name-directory (list localname))))
        (tramp-send-command
         v
-        (format "env LC_ALL=en_US.UTF8 LC_CTYPE='' %s %s %s"
+        (format "env LC_ALL=en_US.utf8 LC_CTYPE='' %s %s %s 2>/dev/null"
                 (tramp-get-ls-command v)
                 switches
                 (if (or wildcard