From cdf015b1880d94bc414188ec5980171adc48bed2 Mon Sep 17 00:00:00 2001 From: Michael Albinus Date: Sat, 13 Nov 2010 11:08:21 +0100 Subject: [PATCH] * 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 . This must not be merged with the trunk. --- lisp/ChangeLog | 7 +++++++ lisp/net/tramp.el | 6 +++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index a86be128499..cb4dfb4651d 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,10 @@ +2010-11-13 Michael Albinus + + * 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 + . + 2010-11-13 Glenn Morris * novice.el (disabled-command-function): diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el index 17c8c074c46..e0f25ffd1f3 100644 --- a/lisp/net/tramp.el +++ b/lisp/net/tramp.el @@ -7162,7 +7162,11 @@ and end of region, and are expected to replace the region contents 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") -- 2.11.4.GIT