branch: elpa/projectile
commit 89b42ac4047a990b3c03b5151558f64ed4a0a299
Author: Bozhidar Batsov <[email protected]>
Commit: Bozhidar Batsov <[email protected]>
Replace seq-union with seq-uniq + append for Emacs 27 compatibility
seq-union is not available in Emacs 27's built-in seq.el.
Use (seq-uniq (append ...)) which achieves the same result.
---
CHANGELOG.md | 2 +-
projectile.el | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9beaa59163..8e8f4ea2b8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -36,7 +36,7 @@
* **[Breaking]** Bump minimum required Emacs version from 26.1 to 27.1. This
removes ~30 lines of compatibility code (fileloop fallback, `time-convert`
fallback, `projectile-flatten` shim) and fixes the `tags-query-replace` FIXME
in `projectile-replace-regexp`.
* Add `compat` as a dependency, enabling the use of modern Emacs APIs (e.g.
`string-replace`) on older Emacs versions.
-* Replace most `cl-lib` sequence functions with `seq.el` equivalents
(`seq-filter`, `seq-remove`, `seq-some`, `seq-find`, `seq-sort`, `seq-every-p`,
`seq-difference`, `seq-union`) and convert `cl-case` to `pcase`.
+* Replace most `cl-lib` sequence functions with `seq.el` equivalents
(`seq-filter`, `seq-remove`, `seq-some`, `seq-find`, `seq-sort`, `seq-every-p`,
`seq-difference`) and convert `cl-case` to `pcase`.
* [#1958](https://github.com/bbatsov/projectile/issues/1958): Exclude
`.projectile-cache.eld` from search results (ripgrep/ag/grep) by default.
* [#1957](https://github.com/bbatsov/projectile/pull/1957): Add `:caller`
information to calls to `ivy-read` (used by packages like `ivy-rich`).
* [#1947](https://github.com/bbatsov/projectile/issues/1947):
`projectile-project-name` should be marked as safe.
diff --git a/projectile.el b/projectile.el
index 9cecd1a208..9696c29170 100644
--- a/projectile.el
+++ b/projectile.el
@@ -4465,8 +4465,8 @@ With REGEXP given, don't query the user for a regexp."
(vc-git-grep search-regexp (or files "") root-dir)
;; paths for find-grep should relative and without trailing /
(let ((grep-find-ignored-files
- (seq-union (projectile--globally-ignored-file-suffixes-glob)
- grep-find-ignored-files))
+ (seq-uniq (append
(projectile--globally-ignored-file-suffixes-glob)
+ grep-find-ignored-files)))
(projectile-grep-find-ignored-paths
(append (mapcar (lambda (f) (directory-file-name
(file-relative-name f root-dir)))
(projectile-ignored-directories))
