Merge: 0.4.6

Author: alphapapa

README.org

@@ -412,6 +412,11 @@ Expands into a call to ~org-ql-select~ with the same arguments.  For convenience
 *Changed*
 +  Binding to refresh search/view buffers changed to =r=.
 
+** 0.4.6
+
+*Fixed*
++  Compatibility with newer versions of the =peg= library, which removed a macro used by this package.  (Fixes [[https://github.com/alphapapa/org-ql/issues/75][#75]].  Thanks to [[https://github.com/novoid][Karl Voit]] and [[https://github.com/karlicoss][@karlicoss]] for reporting.)
+
 ** 0.4.5
 
 *Fixed*

org-ql.el

@@ -1671,6 +1671,21 @@ element should be a regexp string."
 (defvar peg-errors nil)
 (defvar peg-stack nil)
 
+(defmacro org-ql--peg-parse-string (rules string &optional noerror)
+  "Parse STRING according to RULES.
+If NOERROR is non-nil, push nil resp. t if the parse failed
+resp. succeded instead of signaling an error."
+  ;; Unfortunately, this macro was moved to peg-tests.el, so we copy it here.
+  `(with-temp-buffer
+     (insert ,string)
+     (goto-char (point-min))
+     ,(if noerror
+	  (let ((entry (make-symbol "entry"))
+		(start (caar rules)))
+	    `(peg-parse (entry (or (and ,start `(-- t)) ""))
+			. ,rules))
+	`(peg-parse . ,rules))))
+
 (cl-eval-when (compile load eval)
   ;; This `eval-when' is necessary, otherwise the macro does not define
   ;; the function correctly, apparently because `org-ql-predicates'
@@ -1697,7 +1712,7 @@ Builds the PEG expression using predicates defined in
          "Return query parsed from plain query string INPUT.
 Multiple predicates are combined with BOOLEAN."
          (unless (s-blank-str? input)
-           (let* ((query (peg-parse-string
+           (let* ((query (org-ql--peg-parse-string
                           ((query (+ term
                                      (opt (+ (syntax-class whitespace) (any)))))
                            (term (or (and negation (list positive-term)

org-ql.info

@@ -64,6 +64,7 @@ Functions / Macros
 Changelog
 
 * 0.5-pre: 05-pre. 
+* 0.4.6: 046. 
 * 0.4.5: 045. 
 * 0.4.4: 044. 
 * 0.4.3: 043. 
@@ -722,6 +723,7 @@ releases.
 * Menu:
 
 * 0.5-pre: 05-pre. 
+* 0.4.6: 046. 
 * 0.4.5: 045. 
 * 0.4.4: 044. 
 * 0.4.3: 043. 
@@ -738,7 +740,7 @@ releases.
 * 0.1: 01. 
 
 
-File: README.info,  Node: 05-pre,  Next: 045,  Up: Changelog
+File: README.info,  Node: 05-pre,  Next: 046,  Up: Changelog
 
 5.1 0.5-pre
 ===========
@@ -754,9 +756,22 @@ File: README.info,  Node: 05-pre,  Next: 045,  Up: Changelog
    • Binding to refresh search/view buffers changed to r.
 
 
-File: README.info,  Node: 045,  Next: 044,  Prev: 05-pre,  Up: Changelog
+File: README.info,  Node: 046,  Next: 045,  Prev: 05-pre,  Up: Changelog
 
-5.2 0.4.5
+5.2 0.4.6
+=========
+
+*Fixed*
+   • Compatibility with newer versions of the peg library, which removed
+     a macro used by this package.  (Fixes #75
+     (https://github.com/alphapapa/org-ql/issues/75).  Thanks to Karl
+     Voit (https://github.com/novoid) and @karlicoss
+     (https://github.com/karlicoss) for reporting.)
+
+
+File: README.info,  Node: 045,  Next: 044,  Prev: 046,  Up: Changelog
+
+5.3 0.4.5
 =========
 
 *Fixed*
@@ -768,7 +783,7 @@ File: README.info,  Node: 045,  Next: 044,  Prev: 05-pre,  Up: Changelog
 
 File: README.info,  Node: 044,  Next: 043,  Prev: 045,  Up: Changelog
 
-5.3 0.4.4
+5.4 0.4.4
 =========
 
 *Fixed*
@@ -780,7 +795,7 @@ File: README.info,  Node: 044,  Next: 043,  Prev: 045,  Up: Changelog
 
 File: README.info,  Node: 043,  Next: 042,  Prev: 044,  Up: Changelog
 
-5.4 0.4.3
+5.5 0.4.3
 =========
 
 *Fixed*
@@ -790,7 +805,7 @@ File: README.info,  Node: 043,  Next: 042,  Prev: 044,  Up: Changelog
 
 File: README.info,  Node: 042,  Next: 041,  Prev: 043,  Up: Changelog
 
-5.5 0.4.2
+5.6 0.4.2
 =========
 
 *Fixed*
@@ -799,7 +814,7 @@ File: README.info,  Node: 042,  Next: 041,  Prev: 043,  Up: Changelog
 
 File: README.info,  Node: 041,  Next: 04,  Prev: 042,  Up: Changelog
 
-5.6 0.4.1
+5.7 0.4.1
 =========
 
 *Fixed*
@@ -809,7 +824,7 @@ File: README.info,  Node: 041,  Next: 04,  Prev: 042,  Up: Changelog
 
 File: README.info,  Node: 04,  Next: 032,  Prev: 041,  Up: Changelog
 
-5.7 0.4
+5.8 0.4
 =======
 
 _Note:_ The next release, 0.5, may include changes which will require
@@ -890,7 +905,7 @@ as they will be pushed to the master branch when ready.
 
 File: README.info,  Node: 032,  Next: 031,  Prev: 04,  Up: Changelog
 
-5.8 0.3.2
+5.9 0.3.2
 =========
 
 *Fixed*
@@ -903,8 +918,8 @@ File: README.info,  Node: 032,  Next: 031,  Prev: 04,  Up: Changelog
 
 File: README.info,  Node: 031,  Next: 03,  Prev: 032,  Up: Changelog
 
-5.9 0.3.1
-=========
+5.10 0.3.1
+==========
 
 *Fixed*
    • Compatibility with Org 9.2.  Thanks to Brian Leung
@@ -913,7 +928,7 @@ File: README.info,  Node: 031,  Next: 03,  Prev: 032,  Up: Changelog
 
 File: README.info,  Node: 03,  Next: 023,  Prev: 031,  Up: Changelog
 
-5.10 0.3
+5.11 0.3
 ========
 
 *Added*
@@ -978,7 +993,7 @@ File: README.info,  Node: 03,  Next: 023,  Prev: 031,  Up: Changelog
 
 File: README.info,  Node: 023,  Next: 022,  Prev: 03,  Up: Changelog
 
-5.11 0.2.3
+5.12 0.2.3
 ==========
 
 *Fixed*
@@ -988,7 +1003,7 @@ File: README.info,  Node: 023,  Next: 022,  Prev: 03,  Up: Changelog
 
 File: README.info,  Node: 022,  Next: 021,  Prev: 023,  Up: Changelog
 
-5.12 0.2.2
+5.13 0.2.2
 ==========
 
 *Fixed*
@@ -999,7 +1014,7 @@ File: README.info,  Node: 022,  Next: 021,  Prev: 023,  Up: Changelog
 
 File: README.info,  Node: 021,  Next: 02,  Prev: 022,  Up: Changelog
 
-5.13 0.2.1
+5.14 0.2.1
 ==========
 
 *Fixed*
@@ -1009,7 +1024,7 @@ File: README.info,  Node: 021,  Next: 02,  Prev: 022,  Up: Changelog
 
 File: README.info,  Node: 02,  Next: 01,  Prev: 021,  Up: Changelog
 
-5.14 0.2
+5.15 0.2
 ========
 
 *Added*
@@ -1092,7 +1107,7 @@ File: README.info,  Node: 02,  Next: 01,  Prev: 021,  Up: Changelog
 
 File: README.info,  Node: 01,  Prev: 02,  Up: Changelog
 
-5.15 0.1
+5.16 0.1
 ========
 
 First tagged release.
@@ -1150,46 +1165,47 @@ GPLv3
 
 Tag Table:
 Node: Top225
-Node: Contents1497
-Node: Screenshots1620
-Node: Installation1738
-Node: Quelpa2376
-Node: Usage2819
-Node: Commands3168
-Node: org-ql-search3641
-Node: helm-org-ql5355
-Node: org-ql-view5767
-Node: org-ql-view-sidebar6267
-Node: org-ql-view-recent-items6623
-Node: org-ql-sparse-tree7107
-Node: Queries7907
-Node: Non-sexp query syntax8815
-Node: General predicates10522
-Node: Ancestor/descendant predicates15737
-Node: Date/time predicates16865
-Node: Functions / Macros19520
-Node: Agenda-like views19753
-Node: Listing / acting-on results21158
-Node: Changelog25760
-Node: 05-pre26384
-Node: 04526748
-Node: 04427110
-Node: 04327467
-Node: 04227662
-Node: 04127821
-Node: 0428060
-Node: 03231991
-Node: 03132368
-Node: 0332563
-Node: 02335538
-Node: 02235766
-Node: 02136034
-Node: 0236233
-Node: 0140268
-Node: Notes40369
-Node: Comparison with Org Agenda searches40531
-Node: org-sidebar41403
-Node: License41682
+Node: Contents1512
+Node: Screenshots1635
+Node: Installation1753
+Node: Quelpa2391
+Node: Usage2834
+Node: Commands3183
+Node: org-ql-search3656
+Node: helm-org-ql5370
+Node: org-ql-view5782
+Node: org-ql-view-sidebar6282
+Node: org-ql-view-recent-items6638
+Node: org-ql-sparse-tree7122
+Node: Queries7922
+Node: Non-sexp query syntax8830
+Node: General predicates10537
+Node: Ancestor/descendant predicates15752
+Node: Date/time predicates16880
+Node: Functions / Macros19535
+Node: Agenda-like views19768
+Node: Listing / acting-on results21173
+Node: Changelog25775
+Node: 05-pre26414
+Node: 04626778
+Node: 04527181
+Node: 04427540
+Node: 04327897
+Node: 04228092
+Node: 04128251
+Node: 0428490
+Node: 03232421
+Node: 03132798
+Node: 0332995
+Node: 02335970
+Node: 02236198
+Node: 02136466
+Node: 0236665
+Node: 0140700
+Node: Notes40801
+Node: Comparison with Org Agenda searches40963
+Node: org-sidebar41835
+Node: License42114
 
 End Tag Table