* xpm: Fix cl-lib usage and compilation failures.

[gnu-emacs-elpa] / packages / xpm / xpm-ops.el

diff --git a/packages/xpm/xpm-ops.el b/packages/xpm/xpm-ops.el
index 67989ca6b6906600126f5022e7c045f394384b81..a2bc96a1fefead6cbc5789a07ec475a1e757c182 100644 (file)
--- a/packages/xpm/xpm-ops.el
+++ b/packages/xpm/xpm-ops.el
@@ -20,6 +20,8 @@
 ;;; Code:
 
 (require 'queue)
+(require 'cl-lib)
+(require 'xpm)
 
 (defun xpm-flood-fill (px x y)
   (xpm--w/gg (cpp origin y-mult) (xpm--gate)
@@ -38,21 +40,21 @@
                           (beg x)
                           (end x))
                      (when (oldp)
-                       (loop while (oldp)
-                             do (backward-char cpp)
-                             do (decf beg)
-                             finally do (incf beg))
+                       (cl-loop while (oldp)
+                                do (backward-char cpp)
+                                do (cl-decf beg)
+                                finally do (cl-incf beg))
                        (goto-char p)
-                       (loop while (oldp)
-                             do (forward-char cpp)
-                             do (incf end)
-                             finally do (decf end))
+                       (cl-loop while (oldp)
+                                do (forward-char cpp)
+                                do (cl-incf end)
+                                finally do (cl-decf end))
                        (cons beg end)))))
         (setq bye (let ((p (pos x y)))
                     (buffer-substring-no-properties
                      p (+ p cpp))))
         (queue-enqueue q (cons x y))
-        (loop until (queue-empty q)
+        (cl-loop until (queue-empty q)
               do (let* ((coord (queue-dequeue q))
                         (ext (extent coord)))
                    (when ext