jiri/org-ql
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Change: Don't use (setf (plist-get ...))

Browse source 
That expansion is new in Emacs 28, which we don't yet target as the
minimum version.
This commit is contained in:
Adam Porter 2022-06-11 09:19:35 -05:00
parent 1ddc505977
commit ede1a6b10b
1 changed files with 6 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

15
org-ql.el
View file

@ -1567,10 +1567,9 @@ intuitive, general-purpose predicate."
;; are normalized to regexps. Because of that, we must use a ;; are normalized to regexps. Because of that, we must use a
;; coalescing function. ;; coalescing function.
:coalesce (lambda (coalesced-args current-args) :coalesce (lambda (coalesced-args current-args)
(setf (plist-get coalesced-args :regexps) (plist-put coalesced-args :regexps
(list 'quote (append (cadr (plist-get coalesced-args :regexps)) (list 'quote (append (cadr (plist-get coalesced-args :regexps))
(cadr (plist-get current-args :regexps))))) (cadr (plist-get current-args :regexps))))))
coalesced-args)
:normalizers ((`(,predicate-names . ,(and rest (guard (cl-every #'stringp rest)))) :normalizers ((`(,predicate-names . ,(and rest (guard (cl-every #'stringp rest))))
;; If this doesn't match, it's already normalized. ;; If this doesn't match, it's already normalized.
`(rifle :regexps ',(mapcar #'regexp-quote rest)))) `(rifle :regexps ',(mapcar #'regexp-quote rest))))
@ -1779,11 +1778,9 @@ language."
(when (or (not coalesced-args) (when (or (not coalesced-args)
(equal (plist-get current-args :lang) (equal (plist-get current-args :lang)
(plist-get coalesced-args :lang))) (plist-get coalesced-args :lang)))
(setf (plist-get coalesced-args :regexps) (plist-put coalesced-args :regexps (append (plist-get coalesced-args :regexps)
(append (plist-get coalesced-args :regexps) (plist-get current-args :regexps)))
(plist-get current-args :regexps)) (plist-put coalesced-args :lang (plist-get current-args :lang))))
(plist-get coalesced-args :lang) (plist-get current-args :lang))
coalesced-args))
:normalizers ((`(,predicate-names . ,args) :normalizers ((`(,predicate-names . ,args)
;; Rewrite to use keyword args. ;; Rewrite to use keyword args.
(cond ((cl-every #'stringp args) (cond ((cl-every #'stringp args)