emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Emacs-diffs] /srv/bzr/emacs/trunk r111883: * net/tramp-sh.el (tramp-sh-


From: Michael Albinus
Subject: [Emacs-diffs] /srv/bzr/emacs/trunk r111883: * net/tramp-sh.el (tramp-sh-handle-insert-directory): Add
Date: Tue, 26 Feb 2013 09:46:38 +0100
User-agent: Bazaar (2.5.0)

------------------------------------------------------------
revno: 111883
committer: Michael Albinus <address@hidden
branch nick: trunk
timestamp: Tue 2013-02-26 09:46:38 +0100
message:
  * 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.
modified:
  lisp/ChangeLog
  lisp/net/tramp-sh.el
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2013-02-26 01:50:45 +0000
+++ b/lisp/ChangeLog    2013-02-26 08:46:38 +0000
@@ -1,3 +1,10 @@
+2013-02-26  Michael Albinus  <address@hidden>
+
+       * 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  <address@hidden>
 
        * emacs-lisp/easy-mmode.el (define-globalized-minor-mode): Tweak logic.

=== modified file 'lisp/net/tramp-sh.el'
--- a/lisp/net/tramp-sh.el      2013-02-23 12:40:14 +0000
+++ b/lisp/net/tramp-sh.el      2013-02-26 08:46:38 +0000
@@ -2593,12 +2593,12 @@
       ;; 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 @@
          (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


reply via email to

[Prev in Thread] Current Thread [Next in Thread]