From ede1a6b10b6869d05bbe0be38017997c2a4ae48e Mon Sep 17 00:00:00 2001 From: Adam Porter Date: Sat, 11 Jun 2022 09:19:35 -0500 Subject: [PATCH] Change: Don't use (setf (plist-get ...)) That expansion is new in Emacs 28, which we don't yet target as the minimum version. --- org-ql.el | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/org-ql.el b/org-ql.el index 3b832c6..39e4215 100644 --- a/org-ql.el +++ b/org-ql.el @@ -1567,10 +1567,9 @@ intuitive, general-purpose predicate." ;; are normalized to regexps. Because of that, we must use a ;; coalescing function. :coalesce (lambda (coalesced-args current-args) - (setf (plist-get coalesced-args :regexps) - (list 'quote (append (cadr (plist-get coalesced-args :regexps)) - (cadr (plist-get current-args :regexps))))) - coalesced-args) + (plist-put coalesced-args :regexps + (list 'quote (append (cadr (plist-get coalesced-args :regexps)) + (cadr (plist-get current-args :regexps)))))) :normalizers ((`(,predicate-names . ,(and rest (guard (cl-every #'stringp rest)))) ;; If this doesn't match, it's already normalized. `(rifle :regexps ',(mapcar #'regexp-quote rest)))) @@ -1779,11 +1778,9 @@ language." (when (or (not coalesced-args) (equal (plist-get current-args :lang) (plist-get coalesced-args :lang))) - (setf (plist-get coalesced-args :regexps) - (append (plist-get coalesced-args :regexps) - (plist-get current-args :regexps)) - (plist-get coalesced-args :lang) (plist-get current-args :lang)) - coalesced-args)) + (plist-put coalesced-args :regexps (append (plist-get coalesced-args :regexps) + (plist-get current-args :regexps))) + (plist-put coalesced-args :lang (plist-get current-args :lang)))) :normalizers ((`(,predicate-names . ,args) ;; Rewrite to use keyword args. (cond ((cl-every #'stringp args)