[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] 01/01: [xpm int] Use ‘cl-assert’, not ‘assert’; drop ‘cl’ requir
From: |
Thien-Thi Nguyen |
Subject: |
[elpa] 01/01: [xpm int] Use ‘cl-assert’, not ‘assert’; drop ‘cl’ requirement. |
Date: |
Fri, 13 Jun 2014 12:14:59 +0000 |
ttn pushed a commit to branch master
in repository elpa.
commit 8950018e568d0997b9b9d57e22b5ec2d800ff502
Author: Thien-Thi Nguyen <address@hidden>
Date: Fri Jun 13 14:17:27 2014 +0200
[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’.
---
packages/xpm/xpm-m2z.el | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/packages/xpm/xpm-m2z.el b/packages/xpm/xpm-m2z.el
index 39b45d2..d8a5e9c 100644
--- 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*