emacs-diffs
[Top][All Lists]
Advanced

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

[Emacs-diffs] trunk r115111: * net/tramp-sh.el (tramp-remote-process-env


From: Michael Albinus
Subject: [Emacs-diffs] trunk r115111: * net/tramp-sh.el (tramp-remote-process-environment): Set "LC_ALL" to
Date: Fri, 15 Nov 2013 07:37:54 +0000
User-agent: Bazaar (2.6b2)

------------------------------------------------------------
revno: 115111
revision-id: address@hidden
parent: address@hidden
committer: Michael Albinus <address@hidden>
branch nick: trunk
timestamp: Fri 2013-11-15 08:37:18 +0100
message:
  * net/tramp-sh.el (tramp-remote-process-environment): Set "LC_ALL" to
  "en_US.utf8" and "LC_CTYPE" to "".
  (tramp-maybe-open-connection): Set "LC_ALL" to "en_US.utf8".
        (tramp-sh-handle-insert-directory): Don't set "LC_ALL" and "LC_CTYPE".
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/net/tramp-sh.el           trampsh.el-20100913133439-a1faifh29eqoi4nh-1
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2013-11-15 06:52:40 +0000
+++ b/lisp/ChangeLog    2013-11-15 07:37:18 +0000
@@ -1,3 +1,10 @@
+2013-11-15  Michael Albinus  <address@hidden>
+
+       * net/tramp-sh.el (tramp-remote-process-environment): Set "LC_ALL" to
+       "en_US.utf8" and "LC_CTYPE" to "".
+       (tramp-maybe-open-connection): Set "LC_ALL" to "en_US.utf8".
+       (tramp-sh-handle-insert-directory): Don't set "LC_ALL" and "LC_CTYPE".
+
 2013-11-15  Leo Liu  <address@hidden>
 
        * loadhist.el (read-feature): Get rid of fake feature nil.  (Bug#15889)
@@ -55,7 +62,7 @@
 
 2013-11-13  Michael Albinus  <address@hidden>
 
-       * net/tramp.el (tramp-remote-file-name-spec-regexp): An IPV6
+       * net/tramp.el (tramp-remote-file-name-spec-regexp): An IPv6
        address can be empty.
 
        * net/tramp-gvfs.el (tramp-gvfs-handle-insert-directory):

=== modified file 'lisp/net/tramp-sh.el'
--- a/lisp/net/tramp-sh.el      2013-11-11 15:18:07 +0000
+++ b/lisp/net/tramp-sh.el      2013-11-15 07:37:18 +0000
@@ -419,7 +419,8 @@
 
 ;;;###tramp-autoload
 (defcustom tramp-remote-process-environment
-  `("HISTFILE=$HOME/.tramp_history" "HISTSIZE=1" "TMOUT=0" "LC_ALL=C"
+  `("HISTFILE=$HOME/.tramp_history" "HISTSIZE=1" "TMOUT=0"
+    "LC_ALL=en_US.utf8" "LC_CTYPE=''"
     ,(format "TERM=%s" tramp-terminal-type)
     "EMACS=t" ;; Deprecated.
     ,(format "INSIDE_EMACS='%s,tramp:%s'" emacs-version tramp-version)
@@ -2518,13 +2519,10 @@
        (if full-directory-p "yes" "no"))
       ;; 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
-      ;; 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 "%s %s %s 2>/dev/null"
                   (tramp-get-ls-command v)
                   switches
                   (if wildcard
@@ -2540,7 +2538,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 2>/dev/null"
+        (format "%s %s %s 2>/dev/null"
                 (tramp-get-ls-command v)
                 switches
                 (if (or wildcard
@@ -4369,7 +4367,7 @@
              (when (and p (processp p))
                (delete-process p))
              (setenv "TERM" tramp-terminal-type)
-             (setenv "LC_ALL" "C")
+             (setenv "LC_ALL" "en_US.utf8")
              (setenv "PROMPT_COMMAND")
              (setenv "PS1" tramp-initial-end-of-output)
              (let* ((target-alist (tramp-compute-multi-hops vec))
@@ -4479,7 +4477,7 @@
                          tramp-current-user   (or g-user   l-user)
                          tramp-current-host   (or g-host   l-host))
 
-                   ;; Replace login-args place holders.
+                   ;; Replace `login-args' place holders.
                    (setq
                     l-host (or l-host "")
                     l-user (or l-user "")


reply via email to

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