Skip to content

Commit

Permalink
Fix: (org-ql--define-query-preamble-fn) Pcase pattern for Emacs 30
Browse files Browse the repository at this point in the history
Now all tests and lints pass on Emacs versions 27.1-29.4, and the
current 30.0.50-ish snapshot build.

Note: This change was originally applied on master, but it seems
reasonable to apply it to this stable bugfix release now.

Fixes #433.

Reported-by: Akira Komamura <akira.komamura@gmail.com>
Co-developed-by: Stefan Monnier <monnier@iro.umontreal.ca>
  • Loading branch information
alphapapa committed Sep 5, 2024
1 parent 5ea97d2 commit e241354
Show file tree
Hide file tree
Showing 3 changed files with 56 additions and 44 deletions.
3 changes: 3 additions & 0 deletions README.org
Original file line number Diff line number Diff line change
Expand Up @@ -560,6 +560,9 @@ Simple links may also be written manually in either sexp or non-sexp form, like:
+ Predicate ~level~'s preamble optimizer allows expressions in place of the numeric argument. (See [[https://github.com/alphapapa/org-ql/issues/460][#460]]. Thanks to [[https://github.com/Stewmath][Stewmath]] for reporting.)
+ Reading of view settings from Org links in upcoming Emacs version. ([[https://github.com/alphapapa/org-ql/issues/461][#461]]. Thanks to [[https://github.com/snogge][Ola Nilsson]] for help debugging, and for maintaining [[https://github.com/jorgenschaefer/emacs-buttercup][Buttercup]].)

*Compatibility*
+ Fix compilation error on Emacs 30. ([[https://github.com/alphapapa/org-ql/issues/433][#433]]. Thanks to [[https://github.com/akirak][Akira Komamura]] and [[https://github.com/monnier][Stefan Monnier]].)

** 0.8.8

*Fixes*
Expand Down
5 changes: 4 additions & 1 deletion org-ql.el
Original file line number Diff line number Diff line change
Expand Up @@ -1118,7 +1118,10 @@ defined in `org-ql-predicates' by calling `org-ql-defpred'."
;; Only one preamble is allowed
element)
(pcase element
(`(or _) element)
(`(or ,element)
;; A predicate with a single name: unwrap the OR. (Pcase doesn't like
;; "one-armed ORs", giving a "Please avoid it" compilation error.)
element)

,@preamble-patterns

Expand Down
92 changes: 49 additions & 43 deletions org-ql.info
Original file line number Diff line number Diff line change
Expand Up @@ -1099,6 +1099,12 @@ File: README.info, Node: 089-pre, Next: 088, Up: Changelog
maintaining Buttercup
(https://github.com/jorgenschaefer/emacs-buttercup).)

*Compatibility*
• Fix compilation error on Emacs 30. (#433
(https://github.com/alphapapa/org-ql/issues/433). Thanks to Akira
Komamura (https://github.com/akirak) and Stefan Monnier
(https://github.com/monnier).)


File: README.info, Node: 088, Next: 087, Prev: 089-pre, Up: Changelog

Expand Down Expand Up @@ -2077,49 +2083,49 @@ Node: Links38939
Node: Tips39626
Node: Changelog39950
Node: 089-pre40900
Node: 08841801
Node: 08742881
Node: 08644109
Node: 08544343
Node: 08444999
Node: 08345451
Node: 08245792
Node: 08146185
Node: 0846606
Node: 07449332
Node: 07349557
Node: 07250291
Node: 07151212
Node: 0752023
Node: 06354889
Node: 06255422
Node: 06155729
Node: 0656299
Node: 05259355
Node: 05159657
Node: 0560082
Node: 04961613
Node: 04861895
Node: 04762244
Node: 04662653
Node: 04563061
Node: 04463422
Node: 04363781
Node: 04263984
Node: 04164145
Node: 0464392
Node: 03268493
Node: 03168896
Node: 0369093
Node: 02372393
Node: 02272627
Node: 02172907
Node: 0273112
Node: 0177190
Node: Notes77291
Node: Comparison with Org Agenda searches77453
Node: org-sidebar78342
Node: License78621
Node: 08842039
Node: 08743119
Node: 08644347
Node: 08544581
Node: 08445237
Node: 08345689
Node: 08246030
Node: 08146423
Node: 0846844
Node: 07449570
Node: 07349795
Node: 07250529
Node: 07151450
Node: 0752261
Node: 06355127
Node: 06255660
Node: 06155967
Node: 0656537
Node: 05259593
Node: 05159895
Node: 0560320
Node: 04961851
Node: 04862133
Node: 04762482
Node: 04662891
Node: 04563299
Node: 04463660
Node: 04364019
Node: 04264222
Node: 04164383
Node: 0464630
Node: 03268731
Node: 03169134
Node: 0369331
Node: 02372631
Node: 02272865
Node: 02173145
Node: 0273350
Node: 0177428
Node: Notes77529
Node: Comparison with Org Agenda searches77691
Node: org-sidebar78580
Node: License78859

End Tag Table

Expand Down

0 comments on commit e241354

Please sign in to comment.