summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lisp/with-editor.el4
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/with-editor.el b/lisp/with-editor.el
index 99ea6b8..a49349a 100644
--- a/lisp/with-editor.el
+++ b/lisp/with-editor.el
@@ -113,7 +113,7 @@ please see https://github.com/magit/magit/wiki/Emacsclient."))))
(defun with-editor-locate-emacsclient-1 (path depth)
(let* ((version-lst (cl-subseq (split-string emacs-version "\\.") 0 depth))
- (version-reg (concat "^" (mapconcat #'identity version-lst "\\."))))
+ (version-reg (concat "^" (string-join version-lst "\\."))))
(or (locate-file
(cond ((equal (downcase invocation-name) "remacs")
"remacsclient")
@@ -125,7 +125,7 @@ please see https://github.com/magit/magit/wiki/Emacsclient."))))
(nconc (and (boundp 'debian-emacs-flavor)
(list (format ".%s" debian-emacs-flavor)))
(cl-mapcon (lambda (v)
- (setq v (mapconcat #'identity (reverse v) "."))
+ (setq v (string-join (reverse v) "."))
(list v (concat "-" v) (concat ".emacs" v)))
(reverse version-lst))
(list "" "-snapshot" ".emacs-snapshot")))