diff options
| author | John Wiegley <johnw@newartisans.com> | 2016-01-11 22:50:30 -0800 |
|---|---|---|
| committer | John Wiegley <johnw@newartisans.com> | 2016-01-11 22:50:30 -0800 |
| commit | fee9e3ff5e3181e5e477849b5db94e7e39a4e0c4 (patch) | |
| tree | b5a8934d6b587f3517d2b8214a6738374b07820d /lisp/net/soap-client.el | |
| parent | 2d7f4d99f715a3b32bb2873be6e9b4e7e1dad1da (diff) | |
| parent | ce4a052415b70030ee591af3cb5bed0fb79ef3aa (diff) | |
| download | emacs-fee9e3ff5e3181e5e477849b5db94e7e39a4e0c4.tar.gz emacs-fee9e3ff5e3181e5e477849b5db94e7e39a4e0c4.tar.bz2 emacs-fee9e3ff5e3181e5e477849b5db94e7e39a4e0c4.zip | |
Merge from origin/emacs-25
ce4a052 Add defvar-local to lisp-imenu-generic-expression
a0121bc Revert commit b1e3d14845517bfa9fa5d6d3840f3ab3160306fd
76fe2d5 * lisp/emacs-lisp/autoload.el (autoload-find-destination): Doc fix.
1ae088f * lisp/emacs-lisp/autoload.el (autoload-find-destination):
b6b47af Properly encode/decode base64Binary data in SOAP
c632466 Obey coding-system-for-write when writing stdout/stderr in batch
2f32cb5 * doc/misc/efaq.texi (Packages that do not come with Emacs):
Update the URI of MELPA and marmalade-repo.
Reported by CHENG Goa <chenggao@royau.me> in
https://lists.gnu.org/archive/html/emacs-devel/2016-01/msg00390.html.
d2937aa * lisp/progmodes/opascal.el (opascal-mode-syntax-table):
5330c25 * lisp/progmodes/xscheme.el (xscheme-prompt-for-expression-exit):
7380990 Remove function wrongly on AWK Mode value of context
fontification hook.
d400753 * src/buffer.c: Stick with ASCII in doc string.
221240c Reword transient-mark-mode doc string
977d3ea Update doc string of 'selective-display'
229c3fa Make C++ buffers writeable when writing their initial text
properties.
f5c762c Additional changes for "make check-expensive"
1729cf3 ; * admin/MAINTAINERS: Remove myself.
33219d3 Apply text properties for <, > in new after-change function
(C++ Java Modes).
Diffstat (limited to 'lisp/net/soap-client.el')
| -rw-r--r-- | lisp/net/soap-client.el | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/net/soap-client.el b/lisp/net/soap-client.el index f8cdaa9bc56..74024644966 100644 --- a/lisp/net/soap-client.el +++ b/lisp/net/soap-client.el @@ -538,7 +538,7 @@ This is a specialization of `soap-encode-value' for (base64Binary (unless (stringp value) (error "Not a string value for base64Binary")) - (base64-encode-string value)) + (base64-encode-string (encode-coding-string value 'utf-8))) (otherwise (error "Don't know how to encode %s for type %s" @@ -682,7 +682,7 @@ This is a specialization of `soap-decode-type' for decimal byte float double duration) (string-to-number (car contents))) (boolean (string= (downcase (car contents)) "true")) - (base64Binary (base64-decode-string (car contents))) + (base64Binary (decode-coding-string (base64-decode-string (car contents)) 'utf-8)) (anyType (soap-decode-any-type node)) (Array (soap-decode-array node)))))) |