diff --git a/README.org b/README.org index ebf90c7..0ff4d89 100644 --- a/README.org +++ b/README.org @@ -475,6 +475,11 @@ Simple links may also be written manually in either sexp or non-sexp form, like: *Acknowledgments* + [[https://github.com/tpeacock19][tpeacock19]] for extensive help testing new features in this version. +** 0.4.9 + +*Fixed* ++ Agenda restriction in =org-ql-block=. (Fixes [[https://github.com/alphapapa/org-ql/issues/84][#84]]. Thanks to [[https://github.com/yantar92][Ihor Radchenko]].) + ** 0.4.8 *Fixed* diff --git a/org-ql-search.el b/org-ql-search.el index 145b37c..70d846d 100644 --- a/org-ql-search.el +++ b/org-ql-search.el @@ -197,15 +197,14 @@ If `org-ql-block-header' is non-nil, it is used as the header string for the block, otherwise a the header is formed automatically from the query." (let (narrow-p old-beg old-end) - (when-let* ((from (pcase org-agenda-overriding-restriction + (when-let* ((from (pcase org-agenda-restrict ('nil (org-agenda-files nil 'ifmode)) - ('file (get 'org-agenda-files 'org-restrict)) - ('subtree (prog1 org-agenda-restrict - (with-current-buffer org-agenda-restrict - ;; Narrow the buffer; remember to widen it later. - (setf old-beg (point-min) old-end (point-max) - narrow-p t) - (narrow-to-region org-agenda-restrict-begin org-agenda-restrict-end)))))) + (_ (prog1 org-agenda-restrict + (with-current-buffer org-agenda-restrict + ;; Narrow the buffer; remember to widen it later. + (setf old-beg (point-min) old-end (point-max) + narrow-p t) + (narrow-to-region org-agenda-restrict-begin org-agenda-restrict-end)))))) (items (org-ql-select from query :action 'element-with-markers :narrow narrow-p))) diff --git a/org-ql.info b/org-ql.info index 9cc0424..5c9bb45 100644 --- a/org-ql.info +++ b/org-ql.info @@ -67,6 +67,7 @@ Functions / Macros Changelog * 0.5-pre: 05-pre. +* 0.4.9: 049. * 0.4.8: 048. * 0.4.7: 047. * 0.4.6: 046. @@ -815,6 +816,7 @@ releases. * Menu: * 0.5-pre: 05-pre. +* 0.4.9: 049. * 0.4.8: 048. * 0.4.7: 047. * 0.4.6: 046. @@ -834,7 +836,7 @@ releases. * 0.1: 01.  -File: README.info, Node: 05-pre, Next: 048, Up: Changelog +File: README.info, Node: 05-pre, Next: 049, Up: Changelog 5.1 0.5-pre =========== @@ -869,9 +871,20 @@ File: README.info, Node: 05-pre, Next: 048, Up: Changelog testing new features in this version.  -File: README.info, Node: 048, Next: 047, Prev: 05-pre, Up: Changelog +File: README.info, Node: 049, Next: 048, Prev: 05-pre, Up: Changelog -5.2 0.4.8 +5.2 0.4.9 +========= + +*Fixed* + • Agenda restriction in org-ql-block. (Fixes #84 + (https://github.com/alphapapa/org-ql/issues/84). Thanks to Ihor + Radchenko (https://github.com/yantar92).) + + +File: README.info, Node: 048, Next: 047, Prev: 049, Up: Changelog + +5.3 0.4.8 ========= *Fixed* @@ -883,7 +896,7 @@ File: README.info, Node: 048, Next: 047, Prev: 05-pre, Up: Changelog  File: README.info, Node: 047, Next: 046, Prev: 048, Up: Changelog -5.3 0.4.7 +5.4 0.4.7 ========= *Fixed* @@ -896,7 +909,7 @@ File: README.info, Node: 047, Next: 046, Prev: 048, Up: Changelog  File: README.info, Node: 046, Next: 045, Prev: 047, Up: Changelog -5.4 0.4.6 +5.5 0.4.6 ========= *Fixed* @@ -909,7 +922,7 @@ File: README.info, Node: 046, Next: 045, Prev: 047, Up: Changelog  File: README.info, Node: 045, Next: 044, Prev: 046, Up: Changelog -5.5 0.4.5 +5.6 0.4.5 ========= *Fixed* @@ -921,7 +934,7 @@ File: README.info, Node: 045, Next: 044, Prev: 046, Up: Changelog  File: README.info, Node: 044, Next: 043, Prev: 045, Up: Changelog -5.6 0.4.4 +5.7 0.4.4 ========= *Fixed* @@ -933,7 +946,7 @@ File: README.info, Node: 044, Next: 043, Prev: 045, Up: Changelog  File: README.info, Node: 043, Next: 042, Prev: 044, Up: Changelog -5.7 0.4.3 +5.8 0.4.3 ========= *Fixed* @@ -943,7 +956,7 @@ File: README.info, Node: 043, Next: 042, Prev: 044, Up: Changelog  File: README.info, Node: 042, Next: 041, Prev: 043, Up: Changelog -5.8 0.4.2 +5.9 0.4.2 ========= *Fixed* @@ -952,8 +965,8 @@ File: README.info, Node: 042, Next: 041, Prev: 043, Up: Changelog  File: README.info, Node: 041, Next: 04, Prev: 042, Up: Changelog -5.9 0.4.1 -========= +5.10 0.4.1 +========== *Fixed* • level predicate used with arguments in plain queries. (Thanks to @@ -962,7 +975,7 @@ File: README.info, Node: 041, Next: 04, Prev: 042, Up: Changelog  File: README.info, Node: 04, Next: 032, Prev: 041, Up: Changelog -5.10 0.4 +5.11 0.4 ======== _Note:_ The next release, 0.5, may include changes which will require @@ -1043,7 +1056,7 @@ as they will be pushed to the master branch when ready.  File: README.info, Node: 032, Next: 031, Prev: 04, Up: Changelog -5.11 0.3.2 +5.12 0.3.2 ========== *Fixed* @@ -1056,7 +1069,7 @@ File: README.info, Node: 032, Next: 031, Prev: 04, Up: Changelog  File: README.info, Node: 031, Next: 03, Prev: 032, Up: Changelog -5.12 0.3.1 +5.13 0.3.1 ========== *Fixed* @@ -1066,7 +1079,7 @@ File: README.info, Node: 031, Next: 03, Prev: 032, Up: Changelog  File: README.info, Node: 03, Next: 023, Prev: 031, Up: Changelog -5.13 0.3 +5.14 0.3 ======== *Added* @@ -1131,7 +1144,7 @@ File: README.info, Node: 03, Next: 023, Prev: 031, Up: Changelog  File: README.info, Node: 023, Next: 022, Prev: 03, Up: Changelog -5.14 0.2.3 +5.15 0.2.3 ========== *Fixed* @@ -1141,7 +1154,7 @@ File: README.info, Node: 023, Next: 022, Prev: 03, Up: Changelog  File: README.info, Node: 022, Next: 021, Prev: 023, Up: Changelog -5.15 0.2.2 +5.16 0.2.2 ========== *Fixed* @@ -1152,7 +1165,7 @@ File: README.info, Node: 022, Next: 021, Prev: 023, Up: Changelog  File: README.info, Node: 021, Next: 02, Prev: 022, Up: Changelog -5.16 0.2.1 +5.17 0.2.1 ========== *Fixed* @@ -1162,7 +1175,7 @@ File: README.info, Node: 021, Next: 02, Prev: 022, Up: Changelog  File: README.info, Node: 02, Next: 01, Prev: 021, Up: Changelog -5.17 0.2 +5.18 0.2 ======== *Added* @@ -1245,7 +1258,7 @@ File: README.info, Node: 02, Next: 01, Prev: 021, Up: Changelog  File: README.info, Node: 01, Prev: 02, Up: Changelog -5.18 0.1 +5.19 0.1 ======== First tagged release. @@ -1303,52 +1316,53 @@ GPLv3  Tag Table: Node: Top225 -Node: Contents1579 -Node: Screenshots1702 -Node: Installation1820 -Node: Quelpa2458 -Node: Usage2901 -Node: Commands3299 -Node: org-ql-search3772 -Node: helm-org-ql5422 -Node: org-ql-view5834 -Node: org-ql-view-sidebar6334 -Node: org-ql-view-recent-items6690 -Node: org-ql-sparse-tree7174 -Node: Queries7974 -Node: Non-sexp query syntax8882 -Node: General predicates10589 -Node: Ancestor/descendant predicates16002 -Node: Date/time predicates17130 -Node: Functions / Macros19785 -Node: Agenda-like views20040 -Node: Listing / acting-on results21445 -Node: Dynamic block26047 -Node: Links28745 -Node: Tips29432 -Node: Changelog29750 -Node: 05-pre30419 -Node: 04831658 -Node: 04732008 -Node: 04632403 -Node: 04532803 -Node: 04433162 -Node: 04333519 -Node: 04233714 -Node: 04133873 -Node: 0434112 -Node: 03238045 -Node: 03138424 -Node: 0338621 -Node: 02341596 -Node: 02241824 -Node: 02142092 -Node: 0242291 -Node: 0146326 -Node: Notes46427 -Node: Comparison with Org Agenda searches46589 -Node: org-sidebar47461 -Node: License47740 +Node: Contents1594 +Node: Screenshots1717 +Node: Installation1835 +Node: Quelpa2473 +Node: Usage2916 +Node: Commands3314 +Node: org-ql-search3787 +Node: helm-org-ql5437 +Node: org-ql-view5849 +Node: org-ql-view-sidebar6349 +Node: org-ql-view-recent-items6705 +Node: org-ql-sparse-tree7189 +Node: Queries7989 +Node: Non-sexp query syntax8897 +Node: General predicates10604 +Node: Ancestor/descendant predicates16017 +Node: Date/time predicates17145 +Node: Functions / Macros19800 +Node: Agenda-like views20055 +Node: Listing / acting-on results21460 +Node: Dynamic block26062 +Node: Links28760 +Node: Tips29447 +Node: Changelog29765 +Node: 05-pre30449 +Node: 04931688 +Node: 04831966 +Node: 04732313 +Node: 04632708 +Node: 04533108 +Node: 04433467 +Node: 04333824 +Node: 04234019 +Node: 04134178 +Node: 0434419 +Node: 03238352 +Node: 03138731 +Node: 0338928 +Node: 02341903 +Node: 02242131 +Node: 02142399 +Node: 0242598 +Node: 0146633 +Node: Notes46734 +Node: Comparison with Org Agenda searches46896 +Node: org-sidebar47768 +Node: License48047  End Tag Table