[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals/mmm-mode 79fcf10 3/9: Namespace unnamespaced cl- functi
From: |
Dmitry Gutov |
Subject: |
[elpa] externals/mmm-mode 79fcf10 3/9: Namespace unnamespaced cl- functions with mmm- |
Date: |
Fri, 23 Mar 2018 17:47:42 -0400 (EDT) |
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)))
- [elpa] externals/mmm-mode updated (3aa09e6 -> 792249b), Dmitry Gutov, 2018/03/23
- [elpa] externals/mmm-mode ee625de 5/9: Merge pull request #82 from AdamNiederer/unbreak-cl, Dmitry Gutov, 2018/03/23
- [elpa] externals/mmm-mode 00222a0 4/9: Namespace the rest of the functions in mmm-region, Dmitry Gutov, 2018/03/23
- [elpa] externals/mmm-mode 5ffed8b 1/9: Namespace cl functions, Dmitry Gutov, 2018/03/23
- [elpa] externals/mmm-mode da8fd1f 2/9: Revert cl namespacing and add aliases for emacs < 26, Dmitry Gutov, 2018/03/23
- [elpa] externals/mmm-mode 5fce57d 7/9: Fix Emacs 26+, Dmitry Gutov, 2018/03/23
- [elpa] externals/mmm-mode 12cd499 6/9: Replace cadddr and caddr with nth, Dmitry Gutov, 2018/03/23
- [elpa] externals/mmm-mode d40683c 8/9: Remove #' from all lambda forms, Dmitry Gutov, 2018/03/23
- [elpa] externals/mmm-mode 79fcf10 3/9: Namespace unnamespaced cl- functions with mmm-,
Dmitry Gutov <=
- [elpa] externals/mmm-mode 792249b 9/9: Release 0.5.6, Dmitry Gutov, 2018/03/23