[elpa] externals/mmm-mode 79fcf10 3/9: Namespace unnamespaced cl- functions with mmm-

[Dmitry Gutov]

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

    Namespace unnamespaced cl- functions with mmm-
    
    Also fixup delimiters in mmm-compat
---
 mmm-compat.el | 11 ++++++-----
 mmm-region.el | 14 +++++++-------
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/mmm-compat.el b/mmm-compat.el
index c3c55b5..cf03858 100644
--- a/mmm-compat.el
+++ b/mmm-compat.el
@@ -115,15 +115,16 @@ This text should not be modified."
        (insert-buffer ,buffer)
        (current-buffer))))
 
-;;; {{{ Emacs < 26 requires namespaced CL functions
+;;}}}
+;;{{{ Emacs < 26 requires namespaced CL functions
 
 (when (< emacs-major-version 26)
   (require 'cl-lib)
-  (defalias 'mapcan 'cl-mapcan)
-  (defalias 'cadddr 'cl-cadddr)
-  (defalias 'caddr ' cl-caddr))
+  (defalias 'mmm-mapcan 'cl-mapcan)
+  (defalias 'mmm-cadddr 'cl-cadddr)
+  (defalias 'mmm-caddr ' cl-caddr))
 
-;;; }}}
+;;}}}
 
 (provide 'mmm-compat)
 
diff --git a/mmm-region.el b/mmm-region.el
index d8b98f5..49979e1 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)
+  (mmm-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 (mmm-caddr element) t)))
+                       (if (functionp (mmm-caddr element))
+                           (funcall (mmm-caddr element))
+                         (member mode (mmm-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)
+  (mmm-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)
+                        (mmm-mapcan (lambda (ovl)
                                     `(,(overlay-start ovl)
                                       ,(overlay-end ovl)))
                                 (mmm-overlays-overlapping start stop)))