emacs-elpa-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[elpa] externals/mmm-mode 12cd499 6/9: Replace cadddr and caddr with nth


From: Dmitry Gutov
Subject: [elpa] externals/mmm-mode 12cd499 6/9: Replace cadddr and caddr with nth
Date: Fri, 23 Mar 2018 17:47:42 -0400 (EDT)

branch: externals/mmm-mode
commit 12cd499c9f84cf5168631ac58e1fb2a68eb0d1bc
Author: Dmitry Gutov <address@hidden>
Commit: Dmitry Gutov <address@hidden>

    Replace cadddr and caddr with nth
---
 mmm-compat.el |  4 +---
 mmm-region.el | 12 ++++++------
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/mmm-compat.el b/mmm-compat.el
index cf03858..e3da616 100644
--- a/mmm-compat.el
+++ b/mmm-compat.el
@@ -120,9 +120,7 @@ This text should not be modified."
 
 (when (< emacs-major-version 26)
   (require 'cl-lib)
-  (defalias 'mmm-mapcan 'cl-mapcan)
-  (defalias 'mmm-cadddr 'cl-cadddr)
-  (defalias 'mmm-caddr ' cl-caddr))
+  (defalias 'mmm-mapcan 'cl-mapcan))
 
 ;;}}}
 
diff --git a/mmm-region.el b/mmm-region.el
index e737393..17f5600 100644
--- a/mmm-region.el
+++ b/mmm-region.el
@@ -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 (mmm-caddr element) t)))
-                       (if (functionp (mmm-caddr element))
-                           (funcall (mmm-caddr element))
-                         (member mode (mmm-caddr element)))
+                            (not (eq (nth 2 element) t)))
+                       (if (functionp (nth 2 element))
+                           (funcall (nth 2 element))
+                         (member mode (nth 2 element)))
                      t)
                    (list (if (consp element) (car element) element))))
           mmm-save-local-variables))
@@ -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 (mmm-caddr elt))
-                         (ovl (mmm-cadddr elt))
+                         (beg (cadr elt)) (end (nth 2 elt))
+                         (ovl (nth 3 elt))
                          ;; FIXME: Messing with syntax-ppss-* vars should not
                          ;; be needed any more in Emacsā‰„26.
                          syntax-ppss-cache



reply via email to

[Prev in Thread] Current Thread [Next in Thread]