Mercurial > emacs
changeset 111612:2529e302a86e
* 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
<Klaus.Reichl@thalesgroup.com>.
This must not be merged with the trunk.
| author | Michael Albinus <michael.albinus@gmx.de> |
|---|---|
| date | Sat, 13 Nov 2010 11:08:21 +0100 |
| parents | 26c02ba5ddb4 |
| children | 8a76f3e33a5a |
| files | lisp/ChangeLog lisp/net/tramp.el |
| diffstat | 2 files changed, 12 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Sat Nov 13 01:16:18 2010 -0800 +++ b/lisp/ChangeLog Sat Nov 13 11:08:21 2010 +0100 @@ -1,3 +1,10 @@ +2010-11-13 Michael Albinus <michael.albinus@gmx.de> + + * 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 + <Klaus.Reichl@thalesgroup.com>. + 2010-11-13 Glenn Morris <rgm@gnu.org> * novice.el (disabled-command-function):
--- a/lisp/net/tramp.el Sat Nov 13 01:16:18 2010 -0800 +++ b/lisp/net/tramp.el Sat Nov 13 11:08:21 2010 +0100 @@ -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")