aboutsummaryrefslogtreecommitdiffstats
path: root/lisp
diff options
context:
space:
mode:
authorBasil L. Contovounesios2020-06-21 14:31:16 +0100
committerBasil L. Contovounesios2020-06-21 14:33:16 +0100
commita4d3897d8f0caa54be1e1d081651ed6640b7f25e (patch)
treef7a4b924761d9adf33b8c617885641448fe3cc8b /lisp
parentf18b035763785ffa9d8e27f3ec2be183b741502e (diff)
downloademacs-a4d3897d8f0caa54be1e1d081651ed6640b7f25e.tar.gz
emacs-a4d3897d8f0caa54be1e1d081651ed6640b7f25e.zip
Replace some uses of cl-mapcan with mapcan
* lisp/progmodes/project.el (project-files, project-files): * lisp/progmodes/xref.el (xref-backend-references) (xref--convert-hits): * test/lisp/emacs-lisp/package-tests.el (package-test-strip-version): Replace cl-mapcan with equivalent calls to mapcan.
Diffstat (limited to 'lisp')
-rw-r--r--lisp/progmodes/project.el4
-rw-r--r--lisp/progmodes/xref.el6
2 files changed, 5 insertions, 5 deletions
diff --git a/lisp/progmodes/project.el b/lisp/progmodes/project.el
index 74495cf07a4..8f6301c6020 100644
--- a/lisp/progmodes/project.el
+++ b/lisp/progmodes/project.el
@@ -195,7 +195,7 @@ subset of the project root and external roots.
195 195
196The default implementation uses `find-program'. PROJECT is used 196The default implementation uses `find-program'. PROJECT is used
197to find the list of ignores for each directory." 197to find the list of ignores for each directory."
198 (cl-mapcan 198 (mapcan
199 (lambda (dir) 199 (lambda (dir)
200 (project--files-in-directory dir 200 (project--files-in-directory dir
201 (project--dir-ignores project dir))) 201 (project--dir-ignores project dir)))
@@ -351,7 +351,7 @@ backend implementation of `project-external-roots'.")
351 (list (project-root project)))) 351 (list (project-root project))))
352 352
353(cl-defmethod project-files ((project (head vc)) &optional dirs) 353(cl-defmethod project-files ((project (head vc)) &optional dirs)
354 (cl-mapcan 354 (mapcan
355 (lambda (dir) 355 (lambda (dir)
356 (let (backend) 356 (let (backend)
357 (if (and (file-equal-p dir (cdr project)) 357 (if (and (file-equal-p dir (cdr project))
diff --git a/lisp/progmodes/xref.el b/lisp/progmodes/xref.el
index 5b5fb4bc47a..3e3a37f6da5 100644
--- a/lisp/progmodes/xref.el
+++ b/lisp/progmodes/xref.el
@@ -264,7 +264,7 @@ be found, return nil.
264The default implementation uses `semantic-symref-tool-alist' to 264The default implementation uses `semantic-symref-tool-alist' to
265find a search tool; by default, this uses \"find | grep\" in the 265find a search tool; by default, this uses \"find | grep\" in the
266`project-current' roots." 266`project-current' roots."
267 (cl-mapcan 267 (mapcan
268 (lambda (dir) 268 (lambda (dir)
269 (xref-references-in-directory identifier dir)) 269 (xref-references-in-directory identifier dir))
270 (let ((pr (project-current t))) 270 (let ((pr (project-current t)))
@@ -1383,8 +1383,8 @@ Such as the current syntax table and the applied syntax properties."
1383 (let (xref--last-file-buffer 1383 (let (xref--last-file-buffer
1384 (tmp-buffer (generate-new-buffer " *xref-temp*"))) 1384 (tmp-buffer (generate-new-buffer " *xref-temp*")))
1385 (unwind-protect 1385 (unwind-protect
1386 (cl-mapcan (lambda (hit) (xref--collect-matches hit regexp tmp-buffer)) 1386 (mapcan (lambda (hit) (xref--collect-matches hit regexp tmp-buffer))
1387 hits) 1387 hits)
1388 (kill-buffer tmp-buffer)))) 1388 (kill-buffer tmp-buffer))))
1389 1389
1390(defun xref--collect-matches (hit regexp tmp-buffer) 1390(defun xref--collect-matches (hit regexp tmp-buffer)