diff options
Diffstat (limited to 'lisp/net/soap-client.el')
| -rw-r--r-- | lisp/net/soap-client.el | 30 |
1 files changed, 16 insertions, 14 deletions
diff --git a/lisp/net/soap-client.el b/lisp/net/soap-client.el index 3cc5569b55c..de1cd9d320f 100644 --- a/lisp/net/soap-client.el +++ b/lisp/net/soap-client.el @@ -10,6 +10,7 @@ ;; Package: soap-client ;; Homepage: https://github.com/alex-hhh/emacs-soap-client ;; Package-Requires: ((cl-lib "0.6.1")) +;;FIXME: Put in `Package-Requires:' the Emacs version we expect. ;; This file is part of GNU Emacs. @@ -658,7 +659,7 @@ representing leap seconds." (if second (if second-fraction (let* ((second-fraction-significand - (replace-regexp-in-string "\\." "" second-fraction)) + (string-replace "." "" second-fraction)) (hertz (expt 10 (length second-fraction-significand))) (ticks (+ (* hertz (string-to-number second)) @@ -771,6 +772,8 @@ This is a specialization of `soap-decode-type' for (Array (soap-decode-array node)))))) (defalias 'soap-type-of + ;; FIXME: Once we drop support for Emacs<25, use generic functions + ;; via `cl-defmethod' instead of our own ad-hoc version of it. (if (eq 'soap-xs-basic-type (type-of (make-soap-xs-basic-type))) ;; `type-of' in Emacs ≥ 26 already does what we need. #'type-of @@ -1263,7 +1266,7 @@ See also `soap-wsdl-resolve-references'." (soap-l2wk (xml-node-name node))) (setf (soap-xs-simple-type-base type) - (mapcar 'soap-l2fq + (mapcar #'soap-l2fq (split-string (or (xml-get-attribute-or-nil node 'memberTypes) "")))) @@ -1343,7 +1346,7 @@ See also `soap-wsdl-resolve-references'." (soap-validate-xs-basic-type value base)))) (error (push (cadr error-object) messages)))) (when messages - (error (mapconcat 'identity (nreverse messages) "; and: ")))) + (error (mapconcat #'identity (nreverse messages) "; and: ")))) (cl-labels ((fail-with-message (format value) (push (format format value) messages) (throw 'invalid nil))) @@ -1935,7 +1938,7 @@ This is a specialization of `soap-decode-type' for (e-name (soap-xs-element-name element)) ;; Heuristic: guess if we need to decode using local ;; namespaces. - (use-fq-names (string-match ":" (symbol-name (car node)))) + (use-fq-names (string-search ":" (symbol-name (car node)))) (children (if e-name (if use-fq-names ;; Find relevant children @@ -2345,8 +2348,8 @@ See also `soap-resolve-references' and (when (= (length (soap-operation-parameter-order operation)) 0) (setf (soap-operation-parameter-order operation) - (mapcar 'car (soap-message-parts - (cdr (soap-operation-input operation)))))) + (mapcar #'car (soap-message-parts + (cdr (soap-operation-input operation)))))) (setf (soap-operation-parameter-order operation) (mapcar (lambda (p) @@ -2391,13 +2394,13 @@ See also `soap-wsdl-resolve-references'." ;; Install resolvers for our types (progn (put (soap-type-of (make-soap-message)) 'soap-resolve-references - 'soap-resolve-references-for-message) + #'soap-resolve-references-for-message) (put (soap-type-of (make-soap-operation)) 'soap-resolve-references - 'soap-resolve-references-for-operation) + #'soap-resolve-references-for-operation) (put (soap-type-of (make-soap-binding)) 'soap-resolve-references - 'soap-resolve-references-for-binding) + #'soap-resolve-references-for-binding) (put (soap-type-of (make-soap-port)) 'soap-resolve-references - 'soap-resolve-references-for-port)) + #'soap-resolve-references-for-port)) (defun soap-wsdl-resolve-references (wsdl) "Resolve all references inside the WSDL structure. @@ -2511,7 +2514,7 @@ Build on WSDL if it is provided." (soap-wsdl-resolve-references (soap-parse-wsdl xml wsdl)) wsdl)) -(defalias 'soap-load-wsdl-from-url 'soap-load-wsdl) +(defalias 'soap-load-wsdl-from-url #'soap-load-wsdl) (defun soap-parse-wsdl-phase-validate-node (node) "Assert that NODE is valid." @@ -2884,7 +2887,7 @@ decode function to perform the actual decoding." (if (fboundp 'define-error) (define-error 'soap-error "SOAP error") - ;; Support older Emacs versions that do not have define-error, so + ;; Support Emacs<24.4 that do not have define-error, so ;; that soap-client can remain unchanged in GNU ELPA. (put 'soap-error 'error-conditions @@ -3123,8 +3126,7 @@ http://schemas.xmlsoap.org/soap/encoding/\"\n")) (defcustom soap-debug nil "When t, enable some debugging facilities." - :type 'boolean - :group 'soap-client) + :type 'boolean) (defun soap-find-port (wsdl service) "Return the WSDL port having SERVICE name. |