Use mapcan instead of cl-mapcan

This was added in Emacs 26.1.
magit · Nov 23, 2024 · 57f20bd · 57f20bd
1 parent 07b6a1a
commit 57f20bd
Showing 1 changed file with 10 additions and 9 deletions.
diff --git a/lisp/with-editor.el b/lisp/with-editor.el
@@ -124,15 +124,16 @@ please see https://github.com/magit/magit/wiki/Emacsclient."))))
                ((bound-and-true-p emacsclient-program-name))
                ("emacsclient"))
          path
-         (cl-mapcan
-          (lambda (v) (cl-mapcar (lambda (e) (concat v e)) exec-suffixes))
-          (nconc (and (boundp 'debian-emacs-flavor)
-                      (list (format ".%s" debian-emacs-flavor)))
-                 (cl-mapcon (lambda (v)
-                              (setq v (string-join (reverse v) "."))
-                              (list v (concat "-" v) (concat ".emacs" v)))
-                            (reverse version-lst))
-                 (cons "" with-editor-emacsclient-program-suffixes)))
+         (mapcan (lambda (v) (cl-mapcar (lambda (e) (concat v e)) exec-suffixes))
+                 (nconc (and (boundp 'debian-emacs-flavor)
+                             (list (format ".%s" debian-emacs-flavor)))
+                        (cl-mapcon (lambda (v)
+                                     (setq v (string-join (reverse v) "."))
+                                     (list v
+                                           (concat "-" v)
+                                           (concat ".emacs" v)))
+                                   (reverse version-lst))
+                        (cons "" with-editor-emacsclient-program-suffixes)))
          (lambda (exec)
            (ignore-errors
              (string-match-p version-reg