[xpm int] Use ‘cl-assert’, not ‘assert’; drop ‘cl’ requirement.

* packages/xpm/xpm-m2z.el: No longer require ‘cl’.
(xpm-m2z-ellipse): Combine center coord components
‘integerp’ check; use ‘cl-assert’ instead of ‘assert’.

diff --git a/packages/xpm/xpm-m2z.el b/packages/xpm/xpm-m2z.el
index 39b45d2a6c6fe0656fb21bbfebb77a6d01b1b887..d8a5e9cf6b24e83cbf435b59eae8a3e12c64866e 100644 (file)
--- a/packages/xpm/xpm-m2z.el
+++ b/packages/xpm/xpm-m2z.el
@@ -34,7 +34,6 @@
 
 (require 'artist)
 (require 'cl-lib)
-(eval-when-compile (require 'cl))
 
 ;;;###autoload
 (defun xpm-m2z-ellipse (cx cy rx ry)
@@ -55,8 +54,10 @@ RX and RY, respectively.  For example:
 
 The span is always an even number.  As a special case,
 if RX or RY is less than 1, the value is nil."
-  (assert (not (integerp cx)))
-  (assert (not (integerp cy)))
+  (cl-assert (and (not (integerp cx))
+                  (not (integerp cy)))
+             nil "Integer component in center coordinate: (%S,%S)"
+             cx cy)
   (unless (or (> 1 (abs rx))
               (> 1 (abs ry)))
     (cl-flet*