Skip to content

Commit ede1a6b

Browse files
committed
Change: Don't use (setf (plist-get ...))
That expansion is new in Emacs 28, which we don't yet target as the minimum version.
1 parent 1ddc505 commit ede1a6b

File tree

1 file changed

+6
-9
lines changed

1 file changed

+6
-9
lines changed

org-ql.el

+6-9
Original file line numberDiff line numberDiff line change
@@ -1567,10 +1567,9 @@ intuitive, general-purpose predicate."
15671567
;; are normalized to regexps. Because of that, we must use a
15681568
;; coalescing function.
15691569
:coalesce (lambda (coalesced-args current-args)
1570-
(setf (plist-get coalesced-args :regexps)
1571-
(list 'quote (append (cadr (plist-get coalesced-args :regexps))
1572-
(cadr (plist-get current-args :regexps)))))
1573-
coalesced-args)
1570+
(plist-put coalesced-args :regexps
1571+
(list 'quote (append (cadr (plist-get coalesced-args :regexps))
1572+
(cadr (plist-get current-args :regexps))))))
15741573
:normalizers ((`(,predicate-names . ,(and rest (guard (cl-every #'stringp rest))))
15751574
;; If this doesn't match, it's already normalized.
15761575
`(rifle :regexps ',(mapcar #'regexp-quote rest))))
@@ -1779,11 +1778,9 @@ language."
17791778
(when (or (not coalesced-args)
17801779
(equal (plist-get current-args :lang)
17811780
(plist-get coalesced-args :lang)))
1782-
(setf (plist-get coalesced-args :regexps)
1783-
(append (plist-get coalesced-args :regexps)
1784-
(plist-get current-args :regexps))
1785-
(plist-get coalesced-args :lang) (plist-get current-args :lang))
1786-
coalesced-args))
1781+
(plist-put coalesced-args :regexps (append (plist-get coalesced-args :regexps)
1782+
(plist-get current-args :regexps)))
1783+
(plist-put coalesced-args :lang (plist-get current-args :lang))))
17871784
:normalizers ((`(,predicate-names . ,args)
17881785
;; Rewrite to use keyword args.
17891786
(cond ((cl-every #'stringp args)

0 commit comments

Comments
 (0)