From 57f20bdb0d50256acdd12019aaa42b609204699b Mon Sep 17 00:00:00 2001 From: Jonas Bernoulli Date: Sat, 23 Nov 2024 22:37:28 +0100 Subject: [PATCH] Use mapcan instead of cl-mapcan This was added in Emacs 26.1. --- lisp/with-editor.el | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/lisp/with-editor.el b/lisp/with-editor.el index 8d19ba7..23e6fb8 100644 --- 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