[elpa] externals/mmm-mode 5ffed8b 1/9: Namespace cl functions

[Dmitry Gutov]

branch: externals/mmm-mode
commit 5ffed8bf5450e644492346b2df23efcb548d0346
Author: Adam Niederer <address@hidden>
Commit: Adam Niederer <address@hidden>

    Namespace cl functions
---
 mmm-region.el | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/mmm-region.el b/mmm-region.el
index d8b98f5..53fab97 100644
--- a/mmm-region.el
+++ b/mmm-region.el
@@ -576,7 +576,7 @@ different keymaps, syntax tables, local variables, etc. for 
submodes."
   "Filter `mmm-save-local-variables' to match TYPE and MODE.
 Return a list \(VAR ...).  In some cases, VAR will be a cons cell
 \(GETTER . SETTER) -- see `mmm-save-local-variables'."
-  (mapcan #'(lambda (element)
+  (cl-mapcan #'(lambda (element)
               (and (if (and (consp element)
                             (cdr element)
                             (cadr element))
@@ -584,10 +584,10 @@ Return a list \(VAR ...).  In some cases, VAR will be a 
cons cell
                      (eq type 'global))
                    (if (and (consp element)
                             (cddr element)
-                            (not (eq (caddr element) t)))
-                       (if (functionp (caddr element))
-                           (funcall (caddr element))
-                         (member mode (caddr element)))
+                            (not (eq (cl-caddr element) t)))
+                       (if (functionp (cl-caddr element))
+                           (funcall (cl-caddr element))
+                         (member mode (cl-caddr element)))
                      t)
                    (list (if (consp element) (car element) element))))
           mmm-save-local-variables))
@@ -596,7 +596,7 @@ Return a list \(VAR ...).  In some cases, VAR will be a 
cons cell
   "Get the local variables and values for TYPE from this buffer.
 Return \((VAR VALUE) ...).  In some cases, VAR will be of the form
 \(GETTER . SETTER) -- see `mmm-save-local-variables'."
-  (mapcan #'(lambda (var)
+  (cl-mapcan #'(lambda (var)
               (if (consp var)
                   `((,var ,(funcall (car var))))
                 (and (boundp var)
@@ -724,7 +724,7 @@ region and mode for the previous position."
   "Return a list of all submode-change positions from START to STOP.
 The list is sorted in order of increasing buffer position."
   (let ((changes (sort (cl-remove-duplicates
-                        (mapcan (lambda (ovl)
+                        (cl-mapcan (lambda (ovl)
                                     `(,(overlay-start ovl)
                                       ,(overlay-end ovl)))
                                 (mmm-overlays-overlapping start stop)))
@@ -849,8 +849,8 @@ calls each respective submode's 
`syntax-propertize-function'."
         (mapc (lambda (elt)
                   (let* ((mode (car elt))
                          (func (get mode 'mmm-syntax-propertize-function))
-                         (beg (cadr elt)) (end (caddr elt))
-                         (ovl (cadddr elt))
+                         (beg (cadr elt)) (end (cl-caddr elt))
+                         (ovl (cl-cadddr elt))
                          ;; FIXME: Messing with syntax-ppss-* vars should not
                          ;; be needed any more in Emacs≥26.
                          syntax-ppss-cache