[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master 055ca3a: Sync with soap-client repository, version
From: |
Thomas Fitzsimmons |
Subject: |
[Emacs-diffs] master 055ca3a: Sync with soap-client repository, version 3.0.2 |
Date: |
Thu, 12 Nov 2015 04:46:07 +0000 |
branch: master
commit 055ca3a57e7326cd24bbb958531f6938466f5fd9
Author: Thomas Fitzsimmons <address@hidden>
Commit: Thomas Fitzsimmons <address@hidden>
Sync with soap-client repository, version 3.0.2
* soap-client.el: Bump version to 3.0.2.
* soap-client.el (soap-warning): Use format, not format-message.
* soap-client.el: Add cl-lib to Package-Requires. Require cl-lib.
(soap-validate-xs-simple-type): Use cl-labels instead of cl-flet.
* soap-client.el: Support Emacs versions that do not have
define-error.
* soap-inspect.el: Remove version header.
* soap-client.el, soap-inspect.el, jira2.el: Fix first line header
format.
---
lisp/net/soap-client.el | 25 +++++++++++++++++--------
lisp/net/soap-inspect.el | 3 +--
2 files changed, 18 insertions(+), 10 deletions(-)
diff --git a/lisp/net/soap-client.el b/lisp/net/soap-client.el
index 8317325..71d4245 100644
--- a/lisp/net/soap-client.el
+++ b/lisp/net/soap-client.el
@@ -1,14 +1,15 @@
-;;;; soap-client.el -- Access SOAP web services -*- lexical-binding: t
-*-
+;;; soap-client.el --- Access SOAP web services -*- lexical-binding: t
-*-
;; Copyright (C) 2009-2015 Free Software Foundation, Inc.
;; Author: Alexandru Harsanyi <address@hidden>
;; Author: Thomas Fitzsimmons <address@hidden>
;; Created: December, 2009
-;; Version: 3.0.1
+;; Version: 3.0.2
;; Keywords: soap, web-services, comm, hypermedia
;; Package: soap-client
;; Homepage: https://github.com/alex-hhh/emacs-soap-client
+;; Package-Requires: ((cl-lib "0.5"))
;; This file is part of GNU Emacs.
@@ -43,6 +44,7 @@
;;; Code:
(eval-when-compile (require 'cl))
+(require 'cl-lib)
(require 'xml)
(require 'xsd-regexp)
@@ -57,8 +59,8 @@
(defsubst soap-warning (message &rest args)
"Display a warning MESSAGE with ARGS, using the 'soap-client warning type."
- (display-warning 'soap-client (apply #'format-message message args)
- :warning))
+ ;; Do not use #'format-message, to support older Emacs versions.
+ (display-warning 'soap-client (apply #'format message args) :warning))
(defgroup soap-client nil
"Access SOAP web services from Emacs."
@@ -1246,9 +1248,9 @@ See also `soap-wsdl-resolve-references'."
(error (push (cadr error-object) messages))))
(when messages
(error (mapconcat 'identity (nreverse messages) "; and: "))))
- (cl-flet ((fail-with-message (format value)
- (push (format format value) messages)
- (throw 'invalid nil)))
+ (cl-labels ((fail-with-message (format value)
+ (push (format format value) messages)
+ (throw 'invalid nil)))
(catch 'invalid
(let ((enumeration (soap-xs-simple-type-enumeration type)))
(when (and (> (length enumeration) 1)
@@ -2753,7 +2755,14 @@ decode function to perform the actual decoding."
;;;; Soap Envelope parsing
-(define-error 'soap-error "SOAP error")
+(if (fboundp 'define-error)
+ (define-error 'soap-error "SOAP error")
+ ;; Support older Emacs versions that do not have define-error, so
+ ;; that soap-client can remain unchanged in GNU ELPA.
+ (put 'soap-error
+ 'error-conditions
+ '(error soap-error))
+ (put 'soap-error 'error-message "SOAP error"))
(defun soap-parse-envelope (node operation wsdl)
"Parse the SOAP envelope in NODE and return the response.
diff --git a/lisp/net/soap-inspect.el b/lisp/net/soap-inspect.el
index b01e2bf..a443041 100644
--- a/lisp/net/soap-inspect.el
+++ b/lisp/net/soap-inspect.el
@@ -1,10 +1,9 @@
-;;;; soap-inspect.el -- Interactive WSDL inspector -*- lexical-binding: t
-*-
+;;; soap-inspect.el --- Interactive WSDL inspector -*- lexical-binding: t
-*-
;; Copyright (C) 2010-2015 Free Software Foundation, Inc.
;; Author: Alexandru Harsanyi <address@hidden>
;; Created: October 2010
-;; Version: 3.0.1
;; Keywords: soap, web-services, comm, hypermedia
;; Package: soap-client
;; Homepage: https://github.com/alex-hhh/emacs-soap-client
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] master 055ca3a: Sync with soap-client repository, version 3.0.2,
Thomas Fitzsimmons <=