Merge pull request emacs-ess#522 from jabranham/fix-tests

tests: use cl-lib functions rather than cl functions
izahn · Apr 16, 2018 · b53f7c4 · b53f7c4
2 parents eb20f7c + 14e5d07
commit b53f7c4
Showing 1 changed file with 9 additions and 7 deletions.
diff --git a/test/ess-literate-tests.el b/test/ess-literate-tests.el
@@ -1,3 +1,5 @@
+(eval-when-compile
+  (require 'cl-lib))
 
 (defun ess-ltest-check (file)
   (let ((path (expand-file-name file "literate")))
@@ -241,13 +243,13 @@
 
 (defun ess-ltest-decode-keysequence (str)
   "Decode STR from e.g. \"23ab5c\" to '(23 \"a\" \"b\" 5 \"c\")"
-  (let ((table (copy-seq (syntax-table))))
-    (loop for i from ?0 to ?9 do
-         (modify-syntax-entry i "." table))
-    (loop for i from ? to ? do
-         (modify-syntax-entry i "w" table))
-    (loop for i in '(? ?\( ?\) ?\[ ?\] ?{ ?} ?\" ?\' ?\ )
-       do (modify-syntax-entry i "w" table))
+  (let ((table (copy-sequence (syntax-table))))
+    (cl-loop for i from ?0 to ?9 do
+             (modify-syntax-entry i "." table))
+    (cl-loop for i from ? to ? do
+             (modify-syntax-entry i "w" table))
+    (cl-loop for i in '(? ?\( ?\) ?\[ ?\] ?{ ?} ?\" ?\' ?\ )
+             do (modify-syntax-entry i "w" table))
     (cl-mapcan (lambda (x)
                  (let ((y (ignore-errors (read x))))
                    (if (numberp y)