[nongnu] elpa/macrostep d6aa67c 097/110: Be consistent about only using prefixed `cl-lib`

[ELPA Syncer]

branch: elpa/macrostep
commit d6aa67c60170c31fbf255cf1b3fe43550f57f328
Author: joddie <jonxfield@gmail.com>
Commit: joddie <jonxfield@gmail.com>

    Be consistent about only using prefixed `cl-lib`
---
 macrostep-test.el | 17 ++++++++---------
 macrostep.el      | 14 +++++++-------
 2 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/macrostep-test.el b/macrostep-test.el
index 6ca3a60..c36b345 100644
--- a/macrostep-test.el
+++ b/macrostep-test.el
@@ -20,7 +20,6 @@
 (require 'ert)
 (require 'macrostep)
 (require 'macrostep-c)
-(require 'cl-lib)
 
 
 ;;;; Conveniences for defining tests
@@ -103,7 +102,7 @@
 
 (ert-deftest macrostep-expand-macrolet ()
   (macrostep-with-text
-      '(macrolet
+      '(cl-macrolet
         ((test (&rest args) `(expansion of ,@args)))
         (first body form)
         (second body form)
@@ -116,7 +115,7 @@
 (ert-deftest macrostep-expand-macrolet-2 ()
   (macrostep-with-text
       ;; Taken from org-notify.el.
-      '(macrolet ((get (k) `(plist-get list ,k))
+      '(cl-macrolet ((get (k) `(plist-get list ,k))
                   (pr (k v) `(setq result (plist-put result ,k ,v))))
         (let* ((list (nth 1 heading))      (notify (or (get :notify) 
"default"))
                (deadline (org-notify-convert-deadline (get :deadline)))
@@ -170,7 +169,7 @@
 
 (ert-deftest macrostep-expand-shadowed-macrolet ()
   (macrostep-with-text
-      '(macrolet
+      '(cl-macrolet
         ((test-macro (&rest forms) (cons 'shadowed forms))
          (test-macro (&rest forms) (cons 'outer-definition forms)))
         (test-macro first (call))
@@ -187,7 +186,7 @@
 (ert-deftest macrostep-environnment-at-point ()
   (macrostep-with-text
       ;; Taken from org-notify.el.
-      '(macrolet ((get (k) `(plist-get list ,k))
+      '(cl-macrolet ((get (k) `(plist-get list ,k))
                   (pr (k v) `(setq result (plist-put result ,k ,v))))
         (body forms))
     (search-forward "(body")
@@ -255,10 +254,10 @@
   (with-temp-buffer
     (emacs-lisp-mode)
     (macrostep-pp
-     '(macrolet ((some-macro (&rest forms) (cons 'progn forms)))
-       (some-macro with (arguments))
-       (intervening body forms)
-       (some-macro with (more) (arguments)))
+     '(cl-macrolet ((some-macro (&rest forms) (cons 'progn forms)))
+       (some-macro with (arguments))
+       (intervening body forms)
+       (some-macro with (more) (arguments)))
      nil)
     (cl-flet ((search (text)
                 (macrostep-goto text t)
diff --git a/macrostep.el b/macrostep.el
index 38e8512..85550e0 100644
--- a/macrostep.el
+++ b/macrostep.el
@@ -1,14 +1,15 @@
 ;;; macrostep.el --- interactive macro expander
 
-;; Copyright (C) 2012-2015 Jonathan Oddie <j.j.oddie@gmail.com>
+;; Copyright (C) 2012-2015 Jon Oddie <j.j.oddie@gmail.com>
 
 ;; Author:     joddie <j.j.oddie@gmail.com>
 ;; Maintainer: joddie <j.j.oddie@gmail.com>
 ;; Created:    16 January 2012
-;; Updated:    01 October 2015
+;; Updated:    04 December 2015
 ;; Version:    0.9
 ;; Keywords:   lisp, languages, macro, debugging
 ;; Url:        https://github.com/joddie/macrostep
+;; Package-Requires: ((emacs "24") (cl-lib "0.5"))
 
 ;; This file is NOT part of GNU Emacs.
 
@@ -255,11 +256,10 @@
 
 ;;; Code:
 
-;; We use `pp-buffer' to pretty-print macro expansions
 (require 'pp)
 (require 'ring)
+(require 'cl-lib)
 (eval-when-compile
-  (require 'cl)
   (require 'pcase))
 
 
@@ -995,9 +995,9 @@ Controls the printing of sub-forms in 
`macrostep-print-sexp'.")
     `(let ((,start (point)))
        (prog1
            ,form
-         ,@(loop for (key value) on plist by #'cddr
-                 collect `(put-text-property ,start (point)
-                                             ,key ,value))))))
+         ,@(cl-loop for (key value) on plist by #'cddr
+                    collect `(put-text-property ,start (point)
+                                                ,key ,value))))))
 
 (defun macrostep-print-sexp (sexp)
   "Insert SEXP like `print', fontifying macro forms and uninterned symbols.