[Emacs-diffs] /srv/bzr/emacs/emacs-23 r100207: * net/tramp.el (tramp-remote-coding-commands): Add an alternative

[Michael Albinus]

------------------------------------------------------------
revno: 100207
committer: Michael Albinus <address@hidden>
branch nick: emacs-23
timestamp: Sat 2010-11-13 11:08:21 +0100
message:
  * net/tramp.el (tramp-remote-coding-commands): Add an alternative
  using "base64 -d -i".  This is needed for older base64 versions
  from GNU coreutils.  Reported by Klaus Reichl
  <address@hidden>.
  
  This must not be merged with the trunk.
modified:
  lisp/ChangeLog
  lisp/net/tramp.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2010-11-13 09:16:18 +0000
+++ b/lisp/ChangeLog    2010-11-13 10:08:21 +0000
@@ -1,3 +1,10 @@
+2010-11-13  Michael Albinus  <address@hidden>
+
+       * net/tramp.el (tramp-remote-coding-commands): Add an alternative
+       using "base64 -d -i".  This is needed for older base64 versions
+       from GNU coreutils.  Reported by Klaus Reichl
+       <address@hidden>.
+
 2010-11-13  Glenn Morris  <address@hidden>
 
        * novice.el (disabled-command-function):

=== modified file 'lisp/net/tramp.el'
--- a/lisp/net/tramp.el 2010-11-06 14:04:23 +0000
+++ b/lisp/net/tramp.el 2010-11-13 10:08:21 +0000
@@ -7162,7 +7162,11 @@
 with the encoded or decoded results, respectively.")
 
 (defconst tramp-remote-coding-commands
-  '((b64 "base64" "base64 -d")
+  '((b64 "base64" "base64 -d -i")
+    ;; "-i" is more robust with older base64 from GNU coreutils.
+    ;; However, I don't know whether all base64 versions do supports
+    ;; this option.
+    (b64 "base64" "base64 -d")
     (b64 "mimencode -b" "mimencode -u -b")
     (b64 "mmencode -b" "mmencode -u -b")
     (b64 "recode data..base64" "recode base64..data")