emacs-elpa-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[elpa] externals/xpm b395114 22/37: [xpm int] Use cl-* names; drop ‘cl’


From: Stefan Monnier
Subject: [elpa] externals/xpm b395114 22/37: [xpm int] Use cl-* names; drop ‘cl’ requirement.
Date: Sat, 28 Nov 2020 14:15:34 -0500 (EST)

branch: externals/xpm
commit b3951149f516137eb9800e96c6b3628bf8b7fbf8
Author: Thien-Thi Nguyen <ttn@gnu.org>
Commit: Thien-Thi Nguyen <ttn@gnu.org>

    [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’.
---
 xpm.el | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/xpm.el b/xpm.el
index 7ed6f6a..9579da3 100644
--- a/xpm.el
+++ b/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)



reply via email to

[Prev in Thread] Current Thread [Next in Thread]