[nongnu] elpa/pcre2el b7f6cc8d44 5/6: Merge pull request #50 from skangas/fix-require

[ELPA Syncer]

branch: elpa/pcre2el
commit b7f6cc8d447a0e402fface7fac3f5ad02a9f9f6e
Merge: 0a0802b7ed 3a59d133d1
Author: Wes Hardaker <opensource@hardakers.net>
Commit: GitHub <noreply@github.com>

    Merge pull request #50 from skangas/fix-require
    
    Don't require package "a"
---
 pcre2el.el | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/pcre2el.el b/pcre2el.el
index 3d10fe22cb..4294bf7b33 100644
--- a/pcre2el.el
+++ b/pcre2el.el
@@ -6,7 +6,7 @@
 ;; Hacked additionally by:     opensource at hardakers dot net
 ;; Created:                    14 Feb 2012
 ;; Updated:                    13 December 2015
-;; Version:                     1.10
+;; Version:                     1.11
 ;; Url:                         https://github.com/joddie/pcre2el
 ;; Package-Requires:            ((emacs "25.1"))
 
@@ -449,7 +449,6 @@
 (require 'advice)
 (require 'ring)
 (require 'pcase)
-(require 'a)
 
 ;;; Customization group
 (defgroup rxt nil
@@ -1922,8 +1921,8 @@ Example:
                  (let* ((split-point (/ (+ start end) 2))
                         (left (recur start split-point))
                         (right (recur (1+ split-point) end)))
-                   (cl-merge left right))))))
-         (cl-merge (left right)
+                   (pcre2el-merge left right))))))
+         (pcre2el-merge (left right)
            (cond ((null left) right)
                  ((null right) left)
                  (t