Merge: 0.6.3

2022-12-08 20:50:01 -06:00 · 2022-12-08 20:50:01 -06:00 · 9dd1bbb10b
commit 9dd1bbb10b
parent 5f70636556 80b334c269
4 changed files with 120 additions and 94 deletions
--- a/README.org
+++ b/README.org
@ -559,6 +559,12 @@ Simple links may also be written manually in either sexp or non-sexp form, like:
 +  Certain query predicates, when called multiple times in an ~and~ sub-expression, are optimized to a single call.
 +  Use ~buffer-chars-modified-tick~ instead of ~buffer-modified-tick~.  (Thanks to [[https://github.com/yantar92][Ihor Radchenko]].)

+** 0.6.3
+
+*Fixed*
+ Non-sexp query parsing with updated version 1.0.1 of the ~peg~ package.  (Fixes [[https://github.com/alphapapa/org-ql/issues/314][#314]], [[https://github.com/alphapapa/org-ql/issues/316][#316]].  Thanks to [[https://github.com/akirak][Akira Komamura]] and [[https://github.com/joonro][Joon Ro]] for reporting.)
+ Require library ~org-duration~ (apparently necessary in newer Org versions).
+
 ** 0.6.2

 *Fixed*
--- a/makem.sh
+++ b/makem.sh
@ -1009,7 +1009,8 @@ function test-buttercup {

    run_emacs \
        $(args-load-files "${files_project_test[@]}") \
-        -f buttercup-run \
+        --load "$buttercup_file" \
+        --eval "(progn (setq backtrace-on-error-noninteractive nil) (buttercup-run))" \
        && success "Buttercup tests finished without errors." \
            || error "Buttercup tests failed."
 }
--- a/org-ql.el
+++ b/org-ql.el
@ -5,7 +5,7 @@
 ;; Author: Adam Porter <adam@alphapapa.net>
 ;; Url: https://github.com/alphapapa/org-ql
 ;; Version: 0.7-pre
-;; Package-Requires: ((emacs "26.1") (dash "2.18.1") (f "0.17.2") (map "2.1") (org "9.0") (org-super-agenda "1.2") (ov "1.0.6") (peg "1.0") (s "1.12.0") (transient "0.1") (ts "0.2-pre"))
+;; Package-Requires: ((emacs "26.1") (dash "2.18.1") (f "0.17.2") (map "2.1") (org "9.0") (org-super-agenda "1.2") (ov "1.0.6") (peg "1.0.1") (s "1.12.0") (transient "0.1") (ts "0.2-pre"))
 ;; Keywords: hypermedia, outlines, Org, agenda

 ;;; License:
@ -37,6 +37,7 @@

 (require 'cl-lib)
 (require 'org)
+(require 'org-duration)
 (require 'org-element)
 (require 'org-habit)
 (require 'seq)
@ -930,8 +931,7 @@ value of `org-ql-predicates')."
                            ;; obscure bug in `peg': when one keyword is a substring of another,
                            ;; and the shorter one is listed first, the shorter one fails to match.
                            (-sort (-on #'> #'length))))
-         (pexs `((query (+ term
-                           (opt (+ (syntax-class whitespace) (any)))))
+         (pexs `((query (+ (and term (* [blank]))))
                 (term (or (and negation (list positive-term)
                                ;; This is a bit confusing, but it seems to work.  There's probably a better way.
                                `(pred -- (list 'not (car pred))))
--- a/org-ql.info
+++ b/org-ql.info
@ -72,6 +72,7 @@ Functions / Macros
 Changelog

 * 0.7-pre: 07-pre. 
+* 0.6.3: 063. 
 * 0.6.2: 062. 
 * 0.6.1: 061. 
 * 0.6: 06. 
@ -986,6 +987,7 @@ releases.
 * Menu:

 * 0.7-pre: 07-pre. 
+* 0.6.3: 063. 
 * 0.6.2: 062. 
 * 0.6.1: 061. 
 * 0.6: 06. 
@ -1012,7 +1014,7 @@ releases.
 * 0.1: 01. 


-File: README.info,  Node: 07-pre,  Next: 062,  Up: Changelog
+File: README.info,  Node: 07-pre,  Next: 063,  Up: Changelog

 5.1 0.7-pre
 ===========
@ -1050,9 +1052,25 @@ File: README.info,  Node: 07-pre,  Next: 062,  Up: Changelog
     (Thanks to Ihor Radchenko (https://github.com/yantar92).)


-File: README.info,  Node: 062,  Next: 061,  Prev: 07-pre,  Up: Changelog
+File: README.info,  Node: 063,  Next: 062,  Prev: 07-pre,  Up: Changelog

-5.2 0.6.2
+5.2 0.6.3
+=========
+
+*Fixed*
+   • Non-sexp query parsing with updated version 1.0.1 of the ‘peg’
+     package.  (Fixes #314
+     (https://github.com/alphapapa/org-ql/issues/314), #316
+     (https://github.com/alphapapa/org-ql/issues/316).  Thanks to Akira
+     Komamura (https://github.com/akirak) and Joon Ro
+     (https://github.com/joonro) for reporting.)
+   • Require library ‘org-duration’ (apparently necessary in newer Org
+     versions).
+
+
+File: README.info,  Node: 062,  Next: 061,  Prev: 063,  Up: Changelog
+
+5.3 0.6.2
 =========

 *Fixed*
@ -1063,7 +1081,7 @@ File: README.info,  Node: 062,  Next: 061,  Prev: 07-pre,  Up: Changelog

 File: README.info,  Node: 061,  Next: 06,  Prev: 062,  Up: Changelog

-5.3 0.6.1
+5.4 0.6.1
 =========

 *Fixed*
@ -1081,7 +1099,7 @@ File: README.info,  Node: 061,  Next: 06,  Prev: 062,  Up: Changelog

 File: README.info,  Node: 06,  Next: 052,  Prev: 061,  Up: Changelog

-5.4 0.6
+5.5 0.6
 =======

 *Added*
@ -1148,7 +1166,7 @@ File: README.info,  Node: 06,  Next: 052,  Prev: 061,  Up: Changelog

 File: README.info,  Node: 052,  Next: 051,  Prev: 06,  Up: Changelog

-5.5 0.5.2
+5.6 0.5.2
 =========

 *Fixed*
@ -1159,7 +1177,7 @@ File: README.info,  Node: 052,  Next: 051,  Prev: 06,  Up: Changelog

 File: README.info,  Node: 051,  Next: 05,  Prev: 052,  Up: Changelog

-5.6 0.5.1
+5.7 0.5.1
 =========

 *Fixed*
@ -1172,7 +1190,7 @@ File: README.info,  Node: 051,  Next: 05,  Prev: 052,  Up: Changelog

 File: README.info,  Node: 05,  Next: 049,  Prev: 051,  Up: Changelog

-5.7 0.5
+5.8 0.5
 =======

 *Added*
@ -1213,7 +1231,7 @@ File: README.info,  Node: 05,  Next: 049,  Prev: 051,  Up: Changelog

 File: README.info,  Node: 049,  Next: 048,  Prev: 05,  Up: Changelog

-5.8 0.4.9
+5.9 0.4.9
 =========

 *Fixed*
@ -1224,8 +1242,8 @@ File: README.info,  Node: 049,  Next: 048,  Prev: 05,  Up: Changelog

 File: README.info,  Node: 048,  Next: 047,  Prev: 049,  Up: Changelog

-5.9 0.4.8
-=========
+5.10 0.4.8
+==========

 *Fixed*
   • Multiple sorters not preserved when refreshing views.  (Fixes #136
@ -1236,7 +1254,7 @@ File: README.info,  Node: 048,  Next: 047,  Prev: 049,  Up: Changelog

 File: README.info,  Node: 047,  Next: 046,  Prev: 048,  Up: Changelog

-5.10 0.4.7
+5.11 0.4.7
 ==========

 *Fixed*
@ -1249,7 +1267,7 @@ File: README.info,  Node: 047,  Next: 046,  Prev: 048,  Up: Changelog

 File: README.info,  Node: 046,  Next: 045,  Prev: 047,  Up: Changelog

-5.11 0.4.6
+5.12 0.4.6
 ==========

 *Fixed*
@ -1262,7 +1280,7 @@ File: README.info,  Node: 046,  Next: 045,  Prev: 047,  Up: Changelog

 File: README.info,  Node: 045,  Next: 044,  Prev: 046,  Up: Changelog

-5.12 0.4.5
+5.13 0.4.5
 ==========

 *Fixed*
@ -1274,7 +1292,7 @@ File: README.info,  Node: 045,  Next: 044,  Prev: 046,  Up: Changelog

 File: README.info,  Node: 044,  Next: 043,  Prev: 045,  Up: Changelog

-5.13 0.4.4
+5.14 0.4.4
 ==========

 *Fixed*
@ -1286,7 +1304,7 @@ File: README.info,  Node: 044,  Next: 043,  Prev: 045,  Up: Changelog

 File: README.info,  Node: 043,  Next: 042,  Prev: 044,  Up: Changelog

-5.14 0.4.3
+5.15 0.4.3
 ==========

 *Fixed*
@ -1296,7 +1314,7 @@ File: README.info,  Node: 043,  Next: 042,  Prev: 044,  Up: Changelog

 File: README.info,  Node: 042,  Next: 041,  Prev: 043,  Up: Changelog

-5.15 0.4.2
+5.16 0.4.2
 ==========

 *Fixed*
@ -1305,7 +1323,7 @@ File: README.info,  Node: 042,  Next: 041,  Prev: 043,  Up: Changelog

 File: README.info,  Node: 041,  Next: 04,  Prev: 042,  Up: Changelog

-5.16 0.4.1
+5.17 0.4.1
 ==========

 *Fixed*
@ -1315,7 +1333,7 @@ File: README.info,  Node: 041,  Next: 04,  Prev: 042,  Up: Changelog

 File: README.info,  Node: 04,  Next: 032,  Prev: 041,  Up: Changelog

-5.17 0.4
+5.18 0.4
 ========

 _Note:_ The next release, 0.5, may include changes which will require
@ -1396,7 +1414,7 @@ automatically, as they will be pushed to the ‘master’ branch when ready.

 File: README.info,  Node: 032,  Next: 031,  Prev: 04,  Up: Changelog

-5.18 0.3.2
+5.19 0.3.2
 ==========

 *Fixed*
@ -1409,7 +1427,7 @@ File: README.info,  Node: 032,  Next: 031,  Prev: 04,  Up: Changelog

 File: README.info,  Node: 031,  Next: 03,  Prev: 032,  Up: Changelog

-5.19 0.3.1
+5.20 0.3.1
 ==========

 *Fixed*
@ -1419,7 +1437,7 @@ File: README.info,  Node: 031,  Next: 03,  Prev: 032,  Up: Changelog

 File: README.info,  Node: 03,  Next: 023,  Prev: 031,  Up: Changelog

-5.20 0.3
+5.21 0.3
 ========

 *Added*
@ -1487,7 +1505,7 @@ File: README.info,  Node: 03,  Next: 023,  Prev: 031,  Up: Changelog

 File: README.info,  Node: 023,  Next: 022,  Prev: 03,  Up: Changelog

-5.21 0.2.3
+5.22 0.2.3
 ==========

 *Fixed*
@ -1497,7 +1515,7 @@ File: README.info,  Node: 023,  Next: 022,  Prev: 03,  Up: Changelog

 File: README.info,  Node: 022,  Next: 021,  Prev: 023,  Up: Changelog

-5.22 0.2.2
+5.23 0.2.2
 ==========

 *Fixed*
@ -1508,7 +1526,7 @@ File: README.info,  Node: 022,  Next: 021,  Prev: 023,  Up: Changelog

 File: README.info,  Node: 021,  Next: 02,  Prev: 022,  Up: Changelog

-5.23 0.2.1
+5.24 0.2.1
 ==========

 *Fixed*
@ -1518,7 +1536,7 @@ File: README.info,  Node: 021,  Next: 02,  Prev: 022,  Up: Changelog

 File: README.info,  Node: 02,  Next: 01,  Prev: 021,  Up: Changelog

-5.24 0.2
+5.25 0.2
 ========

 *Added*
@ -1601,7 +1619,7 @@ File: README.info,  Node: 02,  Next: 01,  Prev: 021,  Up: Changelog

 File: README.info,  Node: 01,  Prev: 02,  Up: Changelog

-5.25 0.1
+5.26 0.1
 ========

 First tagged release.
@ -1659,69 +1677,70 @@ GPLv3

 Tag Table:
 Node: Top225
-Node: Contents1782
-Node: Screenshots1905
-Node: Installation2023
-Node: Quelpa2537
-Node: Helm support3065
-Node: Usage3468
-Node: Commands3866
-Node: org-ql-find4310
-Node: org-ql-refile4776
-Node: org-ql-search5099
-Node: helm-org-ql6795
-Node: org-ql-view7173
-Node: org-ql-view-sidebar7703
-Node: org-ql-view-recent-items8083
-Node: org-ql-sparse-tree8579
-Node: Queries9379
-Node: Non-sexp query syntax10496
-Node: General predicates12255
-Node: Ancestor/descendant predicates19085
-Node: Date/time predicates20213
-Node: Functions / Macros23337
-Node: Agenda-like views23635
-Ref: Function ‘org-ql-block’23797
-Node: Listing / acting-on results25058
-Ref: Caching25266
-Ref: Function ‘org-ql-select’26179
-Ref: Function ‘org-ql-query’28605
-Ref: Macro ‘org-ql’ (deprecated)30379
-Node: Custom predicates30694
-Ref: Macro ‘org-ql-defpred’30918
-Node: Dynamic block34359
-Node: Links37083
-Node: Tips37770
-Node: Changelog38094
-Node: 07-pre38862
-Node: 06240672
-Node: 06140980
-Node: 0641548
-Node: 05244602
-Node: 05144902
-Node: 0545325
-Node: 04946854
-Node: 04847134
-Node: 04747481
-Node: 04647890
-Node: 04548298
-Node: 04448659
-Node: 04349018
-Node: 04249221
-Node: 04149382
-Node: 0449629
-Node: 03253730
-Node: 03154133
-Node: 0354330
-Node: 02357630
-Node: 02257864
-Node: 02158144
-Node: 0258349
-Node: 0162427
-Node: Notes62528
-Node: Comparison with Org Agenda searches62690
-Node: org-sidebar63579
-Node: License63858
+Node: Contents1797
+Node: Screenshots1920
+Node: Installation2038
+Node: Quelpa2552
+Node: Helm support3080
+Node: Usage3483
+Node: Commands3881
+Node: org-ql-find4325
+Node: org-ql-refile4791
+Node: org-ql-search5114
+Node: helm-org-ql6810
+Node: org-ql-view7188
+Node: org-ql-view-sidebar7718
+Node: org-ql-view-recent-items8098
+Node: org-ql-sparse-tree8594
+Node: Queries9394
+Node: Non-sexp query syntax10511
+Node: General predicates12270
+Node: Ancestor/descendant predicates19100
+Node: Date/time predicates20228
+Node: Functions / Macros23352
+Node: Agenda-like views23650
+Ref: Function ‘org-ql-block’23812
+Node: Listing / acting-on results25073
+Ref: Caching25281
+Ref: Function ‘org-ql-select’26194
+Ref: Function ‘org-ql-query’28620
+Ref: Macro ‘org-ql’ (deprecated)30394
+Node: Custom predicates30709
+Ref: Macro ‘org-ql-defpred’30933
+Node: Dynamic block34374
+Node: Links37098
+Node: Tips37785
+Node: Changelog38109
+Node: 07-pre38892
+Node: 06340702
+Node: 06241237
+Node: 06141542
+Node: 0642110
+Node: 05245164
+Node: 05145464
+Node: 0545887
+Node: 04947416
+Node: 04847696
+Node: 04748045
+Node: 04648454
+Node: 04548862
+Node: 04449223
+Node: 04349582
+Node: 04249785
+Node: 04149946
+Node: 0450193
+Node: 03254294
+Node: 03154697
+Node: 0354894
+Node: 02358194
+Node: 02258428
+Node: 02158708
+Node: 0258913
+Node: 0162991
+Node: Notes63092
+Node: Comparison with Org Agenda searches63254
+Node: org-sidebar64143
+Node: License64422

 End Tag Table