[elpa] scratch/expand-region 40049c1243 01/23: Replace deprecated 'cl package by 'cl-lib

[Stefan Monnier]

branch: scratch/expand-region
commit 40049c1243bb17038107c2a88709ce432c698b2b
Author: Thomas Hisch <t.hisch@gmail.com>
Commit: Magnar Sveen <magnars@gmail.com>

    Replace deprecated 'cl package by 'cl-lib
---
 expand-region-core.el                            |  2 +-
 features/step-definitions/expand-region-steps.el | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/expand-region-core.el b/expand-region-core.el
index 2864b9a9dd..16669d00d6 100644
--- a/expand-region-core.el
+++ b/expand-region-core.el
@@ -26,7 +26,7 @@
 
 ;;; Code:
 
-(eval-when-compile (require 'cl))
+(eval-when-compile (require 'cl-lib))
 (require 'expand-region-custom)
 (declare-function er/expand-region "expand-region")
 
diff --git a/features/step-definitions/expand-region-steps.el 
b/features/step-definitions/expand-region-steps.el
index f73967db1d..dc40da5018 100644
--- a/features/step-definitions/expand-region-steps.el
+++ b/features/step-definitions/expand-region-steps.el
@@ -8,17 +8,17 @@
 
 (When "^I expand the region$"
       (lambda ()
-        (flet ((message (&rest args) nil))
+        (cl-flet ((message (&rest args) nil))
           (er/expand-region 1))))
 
 (When "^I quit$"
       (lambda ()
-        (flet ((signal (&rest args) nil))
+        (cl-flet ((signal (&rest args) nil))
           (keyboard-quit))))
 
 (When "^I expand the region \\([0-9]+\\) times$"
       (lambda (arg)
-        (flet ((message (&rest args) nil))
+        (cl-flet ((message (&rest args) nil))
           (er/expand-region (string-to-number arg)))))
 
 (And "^I contract the region$"
@@ -30,14 +30,14 @@
         (goto-char (point-min))
         (let ((search (search-forward arg nil t))
               (message "Can not place cursor after '%s', because there is no 
such point: '%s'"))
-          (assert search nil message arg (espuds-buffer-contents)))))
+          (cl-assert search nil message arg (espuds-buffer-contents)))))
 
 (When "^I place the cursor before \"\\(.+\\)\"$"
       (lambda (arg)
         (goto-char (point-max))
         (let ((search (search-backward arg nil t))
               (message "Can not place cursor before '%s', because there is no 
such point: '%s'"))
-          (assert search nil message arg (espuds-buffer-contents)))))
+          (cl-assert search nil message arg (espuds-buffer-contents)))))
 
 (When "^I pop the mark$"
       (lambda ()
@@ -78,7 +78,7 @@
         (goto-char (point-min))
         (let ((search (re-search-forward (format "%s" word) nil t))
               (message "Can not go to character '%s' since it does not exist 
in the current buffer: %s"))
-          (assert search nil message word (espuds-buffer-contents))
+          (cl-assert search nil message word (espuds-buffer-contents))
           (if (string-equal "front" pos) (backward-word)))))
 
 (When "^I set \\(.+\\) to \\(.+\\)$"