Skip to content

Commit e241354

Browse files
committed
Fix: (org-ql--define-query-preamble-fn) Pcase pattern for Emacs 30
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 <[email protected]> Co-developed-by: Stefan Monnier <[email protected]>
1 parent 5ea97d2 commit e241354

File tree

3 files changed

+56
-44
lines changed

3 files changed

+56
-44
lines changed

README.org

+3
Original file line numberDiff line numberDiff line change
@@ -560,6 +560,9 @@ Simple links may also be written manually in either sexp or non-sexp form, like:
560560
+ 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.)
561561
+ 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]].)
562562

563+
*Compatibility*
564+
+ 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]].)
565+
563566
** 0.8.8
564567

565568
*Fixes*

org-ql.el

+4-1
Original file line numberDiff line numberDiff line change
@@ -1118,7 +1118,10 @@ defined in `org-ql-predicates' by calling `org-ql-defpred'."
11181118
;; Only one preamble is allowed
11191119
element)
11201120
(pcase element
1121-
(`(or _) element)
1121+
(`(or ,element)
1122+
;; A predicate with a single name: unwrap the OR. (Pcase doesn't like
1123+
;; "one-armed ORs", giving a "Please avoid it" compilation error.)
1124+
element)
11221125

11231126
,@preamble-patterns
11241127

org-ql.info

+49-43
Original file line numberDiff line numberDiff line change
@@ -1099,6 +1099,12 @@ File: README.info, Node: 089-pre, Next: 088, Up: Changelog
10991099
maintaining Buttercup
11001100
(https://github.com/jorgenschaefer/emacs-buttercup).)
11011101

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

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

@@ -2077,49 +2083,49 @@ Node: Links38939
20772083
Node: Tips39626
20782084
Node: Changelog39950
20792085
Node: 089-pre40900
2080-
Node: 08841801
2081-
Node: 08742881
2082-
Node: 08644109
2083-
Node: 08544343
2084-
Node: 08444999
2085-
Node: 08345451
2086-
Node: 08245792
2087-
Node: 08146185
2088-
Node: 0846606
2089-
Node: 07449332
2090-
Node: 07349557
2091-
Node: 07250291
2092-
Node: 07151212
2093-
Node: 0752023
2094-
Node: 06354889
2095-
Node: 06255422
2096-
Node: 06155729
2097-
Node: 0656299
2098-
Node: 05259355
2099-
Node: 05159657
2100-
Node: 0560082
2101-
Node: 04961613
2102-
Node: 04861895
2103-
Node: 04762244
2104-
Node: 04662653
2105-
Node: 04563061
2106-
Node: 04463422
2107-
Node: 04363781
2108-
Node: 04263984
2109-
Node: 04164145
2110-
Node: 0464392
2111-
Node: 03268493
2112-
Node: 03168896
2113-
Node: 0369093
2114-
Node: 02372393
2115-
Node: 02272627
2116-
Node: 02172907
2117-
Node: 0273112
2118-
Node: 0177190
2119-
Node: Notes77291
2120-
Node: Comparison with Org Agenda searches77453
2121-
Node: org-sidebar78342
2122-
Node: License78621
2086+
Node: 08842039
2087+
Node: 08743119
2088+
Node: 08644347
2089+
Node: 08544581
2090+
Node: 08445237
2091+
Node: 08345689
2092+
Node: 08246030
2093+
Node: 08146423
2094+
Node: 0846844
2095+
Node: 07449570
2096+
Node: 07349795
2097+
Node: 07250529
2098+
Node: 07151450
2099+
Node: 0752261
2100+
Node: 06355127
2101+
Node: 06255660
2102+
Node: 06155967
2103+
Node: 0656537
2104+
Node: 05259593
2105+
Node: 05159895
2106+
Node: 0560320
2107+
Node: 04961851
2108+
Node: 04862133
2109+
Node: 04762482
2110+
Node: 04662891
2111+
Node: 04563299
2112+
Node: 04463660
2113+
Node: 04364019
2114+
Node: 04264222
2115+
Node: 04164383
2116+
Node: 0464630
2117+
Node: 03268731
2118+
Node: 03169134
2119+
Node: 0369331
2120+
Node: 02372631
2121+
Node: 02272865
2122+
Node: 02173145
2123+
Node: 0273350
2124+
Node: 0177428
2125+
Node: Notes77529
2126+
Node: Comparison with Org Agenda searches77691
2127+
Node: org-sidebar78580
2128+
Node: License78859
21232129

21242130
End Tag Table
21252131

0 commit comments

Comments
 (0)