@@ -1567,10 +1567,9 @@ intuitive, general-purpose predicate."
1567
1567
; ; are normalized to regexps. Because of that, we must use a
1568
1568
; ; coalescing function.
1569
1569
: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 ))))))
1574
1573
:normalizers ((`(, predicate-names . ,(and rest (guard (cl-every #'stringp rest))))
1575
1574
; ; If this doesn't match, it's already normalized.
1576
1575
`(rifle :regexps ',(mapcar #'regexp-quote rest))))
@@ -1779,11 +1778,9 @@ language."
1779
1778
(when (or (not coalesced-args)
1780
1779
(equal (plist-get current-args :lang )
1781
1780
(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 ))))
1787
1784
:normalizers ((`(, predicate-names . , args )
1788
1785
; ; Rewrite to use keyword args.
1789
1786
(cond ((cl-every #'stringp args)
0 commit comments