[elpa] 01/01: [xpm int] Use cl-* names; drop ‘cl’ requirement.

[Thien-Thi Nguyen]

ttn pushed a commit to branch master
in repository elpa.

commit f1da385fe9cab5c9f7cefc8162a6717dded129aa
Author: Thien-Thi Nguyen <t...@gnu.org>
Date:   Fri Jun 13 14:04:35 2014 +0200

    [xpm int] Use cl-* names; drop ‘cl’ requirement.
    
    * packages/xpm/xpm.el: No longer require ‘cl’.
    (xpm-grok): Use ‘cl-list*’, not ‘list*’.
    (xpm-raster): Use ‘cl-rotatef’, not ‘rotatef’.
---
 packages/xpm/xpm.el |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/xpm/xpm.el b/packages/xpm/xpm.el
index 7ed6f6a..9579da3 100644
--- a/packages/xpm/xpm.el
+++ b/packages/xpm/xpm.el
@@ -64,7 +64,6 @@
 ;;; Code:
 
 (require 'cl-lib)
-(eval-when-compile (require 'cl))
 
 (autoload 'image-toggle-display "image-mode" t) ; hmm is this TRT?
 
@@ -144,8 +143,9 @@ the buffer intangible.  Optional arg SIMPLE inhibits that."
                 ((suppress (span &rest more)
                            (let ((p (point)))
                              (add-text-properties
-                              (- p span) p (list* 'intangible t
-                                                  more)))))
+                              (- p span) p (cl-list*
+                                            'intangible t
+                                            more)))))
               (suppress 1)
               (cl-loop
                repeat h
@@ -415,7 +415,7 @@ see variable `xpm-raster-inhibit-continuity-optimization'."
                        (rset nin nb len t)
                        (xpm-put-points fill (cons beg end) y))))
               finally do (when fill
-                           (rotatef int nin)
+                           (cl-rotatef int nin)
                            (fillarray nin nil)))))))))
 
 (defun xpm-as-xpm (&rest props)