From 5b248f3304ac2604eeecb2ec5e284a2bb9a6c2f2 Mon Sep 17 00:00:00 2001 From: Adam Porter Date: Tue, 8 Jun 2021 10:37:08 -0500 Subject: [PATCH 1/4] Meta: 0.5.1-pre --- README.org | 4 ++ org-ql.el | 2 +- org-ql.info | 147 ++++++++++++++++++++++++++++------------------------ 3 files changed, 84 insertions(+), 69 deletions(-) diff --git a/README.org b/README.org index b3e7e42..9da0746 100644 --- a/README.org +++ b/README.org @@ -461,6 +461,10 @@ Simple links may also be written manually in either sexp or non-sexp form, like: /Note:/ Breaking changes may be made before version 1.0, but in the event of major changes, attempts at backward compatibility will be made with obsolescence declarations, translation of arguments, etc. Users who need stability guarantees before 1.0 may choose to use tagged stable releases. +** 0.5.1-pre + +Nothing yet. + ** 0.5 *Added* diff --git a/org-ql.el b/org-ql.el index 70fefe0..b46d458 100644 --- a/org-ql.el +++ b/org-ql.el @@ -2,7 +2,7 @@ ;; Author: Adam Porter ;; Url: https://github.com/alphapapa/org-ql -;; Version: 0.5 +;; Version: 0.5.1-pre ;; Package-Requires: ((emacs "26.1") (dash "2.13") (dash-functional "1.2.0") (f "0.17.2") (map "2.1") (org "9.0") (org-super-agenda "1.2") (ov "1.0.6") (peg "0.6") (s "1.12.0") (transient "0.1") (ts "0.2-pre")) ;; Keywords: hypermedia, outlines, Org, agenda diff --git a/org-ql.info b/org-ql.info index 60d0048..7c8cd1c 100644 --- a/org-ql.info +++ b/org-ql.info @@ -66,6 +66,7 @@ Functions / Macros Changelog +* 0.5.1-pre: 051-pre. * 0.5: 05. * 0.4.9: 049. * 0.4.8: 048. @@ -831,6 +832,7 @@ releases. * Menu: +* 0.5.1-pre: 051-pre. * 0.5: 05. * 0.4.9: 049. * 0.4.8: 048. @@ -852,9 +854,17 @@ releases. * 0.1: 01.  -File: README.info, Node: 05, Next: 049, Up: Changelog +File: README.info, Node: 051-pre, Next: 05, Up: Changelog -5.1 0.5 +5.1 0.5.1-pre +============= + +Nothing yet. + + +File: README.info, Node: 05, Next: 049, Prev: 051-pre, Up: Changelog + +5.2 0.5 ======= *Added* @@ -895,7 +905,7 @@ File: README.info, Node: 05, Next: 049, Up: Changelog  File: README.info, Node: 049, Next: 048, Prev: 05, Up: Changelog -5.2 0.4.9 +5.3 0.4.9 ========= *Fixed* @@ -906,7 +916,7 @@ File: README.info, Node: 049, Next: 048, Prev: 05, Up: Changelog  File: README.info, Node: 048, Next: 047, Prev: 049, Up: Changelog -5.3 0.4.8 +5.4 0.4.8 ========= *Fixed* @@ -918,7 +928,7 @@ File: README.info, Node: 048, Next: 047, Prev: 049, Up: Changelog  File: README.info, Node: 047, Next: 046, Prev: 048, Up: Changelog -5.4 0.4.7 +5.5 0.4.7 ========= *Fixed* @@ -931,7 +941,7 @@ File: README.info, Node: 047, Next: 046, Prev: 048, Up: Changelog  File: README.info, Node: 046, Next: 045, Prev: 047, Up: Changelog -5.5 0.4.6 +5.6 0.4.6 ========= *Fixed* @@ -944,7 +954,7 @@ File: README.info, Node: 046, Next: 045, Prev: 047, Up: Changelog  File: README.info, Node: 045, Next: 044, Prev: 046, Up: Changelog -5.6 0.4.5 +5.7 0.4.5 ========= *Fixed* @@ -956,7 +966,7 @@ File: README.info, Node: 045, Next: 044, Prev: 046, Up: Changelog  File: README.info, Node: 044, Next: 043, Prev: 045, Up: Changelog -5.7 0.4.4 +5.8 0.4.4 ========= *Fixed* @@ -968,7 +978,7 @@ File: README.info, Node: 044, Next: 043, Prev: 045, Up: Changelog  File: README.info, Node: 043, Next: 042, Prev: 044, Up: Changelog -5.8 0.4.3 +5.9 0.4.3 ========= *Fixed* @@ -978,8 +988,8 @@ File: README.info, Node: 043, Next: 042, Prev: 044, Up: Changelog  File: README.info, Node: 042, Next: 041, Prev: 043, Up: Changelog -5.9 0.4.2 -========= +5.10 0.4.2 +========== *Fixed* • Items’ to-do keywords were not shown in views. @@ -987,7 +997,7 @@ File: README.info, Node: 042, Next: 041, Prev: 043, Up: Changelog  File: README.info, Node: 041, Next: 04, Prev: 042, Up: Changelog -5.10 0.4.1 +5.11 0.4.1 ========== *Fixed* @@ -997,7 +1007,7 @@ File: README.info, Node: 041, Next: 04, Prev: 042, Up: Changelog  File: README.info, Node: 04, Next: 032, Prev: 041, Up: Changelog -5.11 0.4 +5.12 0.4 ======== _Note:_ The next release, 0.5, may include changes which will require @@ -1078,7 +1088,7 @@ as they will be pushed to the master branch when ready.  File: README.info, Node: 032, Next: 031, Prev: 04, Up: Changelog -5.12 0.3.2 +5.13 0.3.2 ========== *Fixed* @@ -1091,7 +1101,7 @@ File: README.info, Node: 032, Next: 031, Prev: 04, Up: Changelog  File: README.info, Node: 031, Next: 03, Prev: 032, Up: Changelog -5.13 0.3.1 +5.14 0.3.1 ========== *Fixed* @@ -1101,7 +1111,7 @@ File: README.info, Node: 031, Next: 03, Prev: 032, Up: Changelog  File: README.info, Node: 03, Next: 023, Prev: 031, Up: Changelog -5.14 0.3 +5.15 0.3 ======== *Added* @@ -1166,7 +1176,7 @@ File: README.info, Node: 03, Next: 023, Prev: 031, Up: Changelog  File: README.info, Node: 023, Next: 022, Prev: 03, Up: Changelog -5.15 0.2.3 +5.16 0.2.3 ========== *Fixed* @@ -1176,7 +1186,7 @@ File: README.info, Node: 023, Next: 022, Prev: 03, Up: Changelog  File: README.info, Node: 022, Next: 021, Prev: 023, Up: Changelog -5.16 0.2.2 +5.17 0.2.2 ========== *Fixed* @@ -1187,7 +1197,7 @@ File: README.info, Node: 022, Next: 021, Prev: 023, Up: Changelog  File: README.info, Node: 021, Next: 02, Prev: 022, Up: Changelog -5.17 0.2.1 +5.18 0.2.1 ========== *Fixed* @@ -1197,7 +1207,7 @@ File: README.info, Node: 021, Next: 02, Prev: 022, Up: Changelog  File: README.info, Node: 02, Next: 01, Prev: 021, Up: Changelog -5.18 0.2 +5.19 0.2 ======== *Added* @@ -1280,7 +1290,7 @@ File: README.info, Node: 02, Next: 01, Prev: 021, Up: Changelog  File: README.info, Node: 01, Prev: 02, Up: Changelog -5.19 0.1 +5.20 0.1 ======== First tagged release. @@ -1338,53 +1348,54 @@ GPLv3  Tag Table: Node: Top225 -Node: Contents1586 -Node: Screenshots1709 -Node: Installation1827 -Node: Quelpa2465 -Node: Usage2908 -Node: Commands3306 -Node: org-ql-search3779 -Node: helm-org-ql5429 -Node: org-ql-view5841 -Node: org-ql-view-sidebar6341 -Node: org-ql-view-recent-items6697 -Node: org-ql-sparse-tree7181 -Node: Queries7981 -Node: Non-sexp query syntax9092 -Node: General predicates10799 -Node: Ancestor/descendant predicates16212 -Node: Date/time predicates17340 -Node: Functions / Macros19995 -Node: Agenda-like views20250 -Node: Listing / acting-on results21655 -Node: Dynamic block26850 -Node: Links29548 -Node: Tips30235 -Node: Changelog30553 -Node: 0531229 -Node: 04932691 -Node: 04832965 -Node: 04733312 -Node: 04633707 -Node: 04534107 -Node: 04434466 -Node: 04334823 -Node: 04235018 -Node: 04135177 -Node: 0435418 -Node: 03239351 -Node: 03139730 -Node: 0339927 -Node: 02342902 -Node: 02243130 -Node: 02143398 -Node: 0243597 -Node: 0147632 -Node: Notes47733 -Node: Comparison with Org Agenda searches47895 -Node: org-sidebar48767 -Node: License49046 +Node: Contents1609 +Node: Screenshots1732 +Node: Installation1850 +Node: Quelpa2488 +Node: Usage2931 +Node: Commands3329 +Node: org-ql-search3802 +Node: helm-org-ql5452 +Node: org-ql-view5864 +Node: org-ql-view-sidebar6364 +Node: org-ql-view-recent-items6720 +Node: org-ql-sparse-tree7204 +Node: Queries8004 +Node: Non-sexp query syntax9115 +Node: General predicates10822 +Node: Ancestor/descendant predicates16235 +Node: Date/time predicates17363 +Node: Functions / Macros20018 +Node: Agenda-like views20273 +Node: Listing / acting-on results21678 +Node: Dynamic block26873 +Node: Links29571 +Node: Tips30258 +Node: Changelog30576 +Node: 051-pre31275 +Node: 0531382 +Node: 04932860 +Node: 04833134 +Node: 04733481 +Node: 04633876 +Node: 04534276 +Node: 04434635 +Node: 04334992 +Node: 04235187 +Node: 04135348 +Node: 0435589 +Node: 03239522 +Node: 03139901 +Node: 0340098 +Node: 02343073 +Node: 02243301 +Node: 02143569 +Node: 0243768 +Node: 0147803 +Node: Notes47904 +Node: Comparison with Org Agenda searches48066 +Node: org-sidebar48938 +Node: License49217  End Tag Table From dc32dcdaaac4a8a311e5b4f07faf748abbf1b674 Mon Sep 17 00:00:00 2001 From: savnkk_manjaro <39103342+natask@users.noreply.github.com> Date: Tue, 2 Feb 2021 19:25:29 -0800 Subject: [PATCH 2/4] Fix: (org-ql-select) Use -sort instead of sort Fixes #186. --- org-ql.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/org-ql.el b/org-ql.el index b46d458..48b823d 100644 --- a/org-ql.el +++ b/org-ql.el @@ -292,7 +292,7 @@ returns nil or non-nil." ;; Default sorting functions (org-ql--sort-by items (-list sort))) ;; Sort by user-given comparator. - ((pred functionp) (sort items sort)) + ((pred functionp) (-sort sort items)) (_ (user-error "SORT must be either nil, one or a list of the defined sorting methods (see documentation), or a comparison function of two arguments"))))) ;;;###autoload From 628fce8f134b8a776043e820f4d782b609e5c105 Mon Sep 17 00:00:00 2001 From: Adam Porter Date: Tue, 8 Jun 2021 11:06:54 -0500 Subject: [PATCH 3/4] Docs: Update changelog --- README.org | 3 ++- org-ql.info | 53 +++++++++++++++++++++++++++++------------------------ 2 files changed, 31 insertions(+), 25 deletions(-) diff --git a/README.org b/README.org index 9da0746..325840b 100644 --- a/README.org +++ b/README.org @@ -463,7 +463,8 @@ Simple links may also be written manually in either sexp or non-sexp form, like: ** 0.5.1-pre -Nothing yet. +*Fixed* ++ Custom sorting functions could corrupt the cache, causing items to disappear after refreshing an =org-ql-search= buffer. ([[https://github.com/alphapapa/org-ql/issues/186][#186]], [[https://github.com/alphapapa/org-ql/issues/187][#187]]. Thanks to [[https://github.com/natask][Nathanael kinfe]].) ** 0.5 diff --git a/org-ql.info b/org-ql.info index 7c8cd1c..dbfc6a9 100644 --- a/org-ql.info +++ b/org-ql.info @@ -859,7 +859,12 @@ File: README.info, Node: 051-pre, Next: 05, Up: Changelog 5.1 0.5.1-pre ============= -Nothing yet. +*Fixed* + • Custom sorting functions could corrupt the cache, causing items to + disappear after refreshing an org-ql-search buffer. (#186 + (https://github.com/alphapapa/org-ql/issues/186), #187 + (https://github.com/alphapapa/org-ql/issues/187). Thanks to + Nathanael kinfe (https://github.com/natask).)  File: README.info, Node: 05, Next: 049, Prev: 051-pre, Up: Changelog @@ -1373,29 +1378,29 @@ Node: Links29571 Node: Tips30258 Node: Changelog30576 Node: 051-pre31275 -Node: 0531382 -Node: 04932860 -Node: 04833134 -Node: 04733481 -Node: 04633876 -Node: 04534276 -Node: 04434635 -Node: 04334992 -Node: 04235187 -Node: 04135348 -Node: 0435589 -Node: 03239522 -Node: 03139901 -Node: 0340098 -Node: 02343073 -Node: 02243301 -Node: 02143569 -Node: 0243768 -Node: 0147803 -Node: Notes47904 -Node: Comparison with Org Agenda searches48066 -Node: org-sidebar48938 -Node: License49217 +Node: 0531692 +Node: 04933170 +Node: 04833444 +Node: 04733791 +Node: 04634186 +Node: 04534586 +Node: 04434945 +Node: 04335302 +Node: 04235497 +Node: 04135658 +Node: 0435899 +Node: 03239832 +Node: 03140211 +Node: 0340408 +Node: 02343383 +Node: 02243611 +Node: 02143879 +Node: 0244078 +Node: 0148113 +Node: Notes48214 +Node: Comparison with Org Agenda searches48376 +Node: org-sidebar49248 +Node: License49527  End Tag Table From 3a04b107387402b5675ed2c6b6c9af1061b2262a Mon Sep 17 00:00:00 2001 From: Adam Porter Date: Tue, 8 Jun 2021 11:12:44 -0500 Subject: [PATCH 4/4] Release: 0.5.1 --- README.org | 2 +- org-ql.el | 2 +- org-ql.info | 108 ++++++++++++++++++++++++++-------------------------- 3 files changed, 56 insertions(+), 56 deletions(-) diff --git a/README.org b/README.org index 325840b..54f5cf1 100644 --- a/README.org +++ b/README.org @@ -461,7 +461,7 @@ Simple links may also be written manually in either sexp or non-sexp form, like: /Note:/ Breaking changes may be made before version 1.0, but in the event of major changes, attempts at backward compatibility will be made with obsolescence declarations, translation of arguments, etc. Users who need stability guarantees before 1.0 may choose to use tagged stable releases. -** 0.5.1-pre +** 0.5.1 *Fixed* + Custom sorting functions could corrupt the cache, causing items to disappear after refreshing an =org-ql-search= buffer. ([[https://github.com/alphapapa/org-ql/issues/186][#186]], [[https://github.com/alphapapa/org-ql/issues/187][#187]]. Thanks to [[https://github.com/natask][Nathanael kinfe]].) diff --git a/org-ql.el b/org-ql.el index 48b823d..fc4f218 100644 --- a/org-ql.el +++ b/org-ql.el @@ -2,7 +2,7 @@ ;; Author: Adam Porter ;; Url: https://github.com/alphapapa/org-ql -;; Version: 0.5.1-pre +;; Version: 0.5.1 ;; Package-Requires: ((emacs "26.1") (dash "2.13") (dash-functional "1.2.0") (f "0.17.2") (map "2.1") (org "9.0") (org-super-agenda "1.2") (ov "1.0.6") (peg "0.6") (s "1.12.0") (transient "0.1") (ts "0.2-pre")) ;; Keywords: hypermedia, outlines, Org, agenda diff --git a/org-ql.info b/org-ql.info index dbfc6a9..a9e2afa 100644 --- a/org-ql.info +++ b/org-ql.info @@ -66,7 +66,7 @@ Functions / Macros Changelog -* 0.5.1-pre: 051-pre. +* 0.5.1: 051. * 0.5: 05. * 0.4.9: 049. * 0.4.8: 048. @@ -832,7 +832,7 @@ releases. * Menu: -* 0.5.1-pre: 051-pre. +* 0.5.1: 051. * 0.5: 05. * 0.4.9: 049. * 0.4.8: 048. @@ -854,10 +854,10 @@ releases. * 0.1: 01.  -File: README.info, Node: 051-pre, Next: 05, Up: Changelog +File: README.info, Node: 051, Next: 05, Up: Changelog -5.1 0.5.1-pre -============= +5.1 0.5.1 +========= *Fixed* • Custom sorting functions could corrupt the cache, causing items to @@ -867,7 +867,7 @@ File: README.info, Node: 051-pre, Next: 05, Up: Changelog Nathanael kinfe (https://github.com/natask).)  -File: README.info, Node: 05, Next: 049, Prev: 051-pre, Up: Changelog +File: README.info, Node: 05, Next: 049, Prev: 051, Up: Changelog 5.2 0.5 ======= @@ -1353,54 +1353,54 @@ GPLv3  Tag Table: Node: Top225 -Node: Contents1609 -Node: Screenshots1732 -Node: Installation1850 -Node: Quelpa2488 -Node: Usage2931 -Node: Commands3329 -Node: org-ql-search3802 -Node: helm-org-ql5452 -Node: org-ql-view5864 -Node: org-ql-view-sidebar6364 -Node: org-ql-view-recent-items6720 -Node: org-ql-sparse-tree7204 -Node: Queries8004 -Node: Non-sexp query syntax9115 -Node: General predicates10822 -Node: Ancestor/descendant predicates16235 -Node: Date/time predicates17363 -Node: Functions / Macros20018 -Node: Agenda-like views20273 -Node: Listing / acting-on results21678 -Node: Dynamic block26873 -Node: Links29571 -Node: Tips30258 -Node: Changelog30576 -Node: 051-pre31275 -Node: 0531692 -Node: 04933170 -Node: 04833444 -Node: 04733791 -Node: 04634186 -Node: 04534586 -Node: 04434945 -Node: 04335302 -Node: 04235497 -Node: 04135658 -Node: 0435899 -Node: 03239832 -Node: 03140211 -Node: 0340408 -Node: 02343383 -Node: 02243611 -Node: 02143879 -Node: 0244078 -Node: 0148113 -Node: Notes48214 -Node: Comparison with Org Agenda searches48376 -Node: org-sidebar49248 -Node: License49527 +Node: Contents1601 +Node: Screenshots1724 +Node: Installation1842 +Node: Quelpa2480 +Node: Usage2923 +Node: Commands3321 +Node: org-ql-search3794 +Node: helm-org-ql5444 +Node: org-ql-view5856 +Node: org-ql-view-sidebar6356 +Node: org-ql-view-recent-items6712 +Node: org-ql-sparse-tree7196 +Node: Queries7996 +Node: Non-sexp query syntax9107 +Node: General predicates10814 +Node: Ancestor/descendant predicates16227 +Node: Date/time predicates17355 +Node: Functions / Macros20010 +Node: Agenda-like views20265 +Node: Listing / acting-on results21670 +Node: Dynamic block26865 +Node: Links29563 +Node: Tips30250 +Node: Changelog30568 +Node: 05131259 +Node: 0531664 +Node: 04933138 +Node: 04833412 +Node: 04733759 +Node: 04634154 +Node: 04534554 +Node: 04434913 +Node: 04335270 +Node: 04235465 +Node: 04135626 +Node: 0435867 +Node: 03239800 +Node: 03140179 +Node: 0340376 +Node: 02343351 +Node: 02243579 +Node: 02143847 +Node: 0244046 +Node: 0148081 +Node: Notes48182 +Node: Comparison with Org Agenda searches48344 +Node: org-sidebar49216 +Node: License49495  End Tag Table