[Emacs-diffs] master a8d0a91: * lisp/net/shr.el: Use cl-lib instead of cl.

[Stefan Monnier]

branch: master
commit a8d0a91841121a7bdae668a5f29c1ba84739e14f
Author: Stefan Monnier <address@hidden>
Commit: Stefan Monnier <address@hidden>

    * lisp/net/shr.el: Use cl-lib instead of cl.
---
 lisp/net/shr.el | 29 +++++++++++++++--------------
 1 file changed, 15 insertions(+), 14 deletions(-)

diff --git a/lisp/net/shr.el b/lisp/net/shr.el
index 6b62a05..2a6b396 100644
--- a/lisp/net/shr.el
+++ b/lisp/net/shr.el
@@ -30,7 +30,7 @@
 
 ;;; Code:
 
-(eval-when-compile (require 'cl))
+(eval-when-compile (require 'cl-lib))
 (eval-when-compile (require 'url))      ;For url-filename's setf handler.
 (require 'browse-url)
 (eval-when-compile (require 'subr-x))
@@ -1790,14 +1790,14 @@ The preference is a float determined from 
`shr-prefer-media-type'."
         (elems (or (dom-attr dom 'shr-suggested-widths)
                    (shr-make-table dom suggested-widths nil
                                    'shr-suggested-widths)))
-        (sketch (loop for line in elems
-                      collect (mapcar #'car line)))
-        (natural (loop for line in elems
-                       collect (mapcar #'cdr line)))
+        (sketch (cl-loop for line in elems
+                         collect (mapcar #'car line)))
+        (natural (cl-loop for line in elems
+                          collect (mapcar #'cdr line)))
         (sketch-widths (shr-table-widths sketch natural suggested-widths)))
     ;; This probably won't work very well.
-    (when (> (+ (loop for width across sketch-widths
-                     summing (1+ width))
+    (when (> (+ (cl-loop for width across sketch-widths
+                        summing (1+ width))
                shr-indentation shr-table-separator-pixel-width)
             (frame-width))
       (setq truncate-lines t))
@@ -2315,13 +2315,14 @@ flags that control whether to collect or render 
objects."
 (defun shr-dom-max-natural-width (dom max)
   (if (eq (dom-tag dom) 'table)
       (max max (or
-               (loop for line in (dom-attr dom 'shr-suggested-widths)
-                     maximize (+
-                               shr-table-separator-length
-                               (loop for elem in line
-                                     summing
-                                     (+ (cdr elem)
-                                        (* 2 shr-table-separator-length)))))
+               (cl-loop
+                 for line in (dom-attr dom 'shr-suggested-widths)
+                maximize (+
+                          shr-table-separator-length
+                          (cl-loop for elem in line
+                                   summing
+                                   (+ (cdr elem)
+                                      (* 2 shr-table-separator-length)))))
                0))
     (dolist (child (dom-children dom))
       (unless (stringp child)