From c9fe19969eac33c6c793cf61f76409b1e017a728 Mon Sep 17 00:00:00 2001 From: "Basil L. Contovounesios" Date: Fri, 19 Feb 2021 17:17:57 +0000 Subject: [PATCH 1/3] Change: Don't depend on deprecated dash-functional Dash 2.18.0 now subsumes dash-functional. See https://github.com/magnars/dash.el/blob/master/NEWS.md#from-217-to-218 --- examples/org-bills-due.el | 1 - helm-org-ql.el | 2 +- org-ql.el | 3 +-- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/examples/org-bills-due.el b/examples/org-bills-due.el index c544734..e416906 100644 --- a/examples/org-bills-due.el +++ b/examples/org-bills-due.el @@ -24,7 +24,6 @@ ;; From MELPA (require 'dash) -(require 'dash-functional) (require 's) ;; org-ql diff --git a/helm-org-ql.el b/helm-org-ql.el index 54d6566..bd3a17c 100644 --- a/helm-org-ql.el +++ b/helm-org-ql.el @@ -3,7 +3,7 @@ ;; Author: Adam Porter ;; URL: https://github.com/alphapapa/org-ql ;; Version: 0.6-pre -;; Package-Requires: ((emacs "26.1") (dash "2.17.0") (s "1.12.0") (helm-org "1.0") (org-ql "0.6-pre")) +;; Package-Requires: ((emacs "26.1") (dash "2.18.0") (s "1.12.0") (helm-org "1.0") (org-ql "0.6-pre")) ;;; Commentary: diff --git a/org-ql.el b/org-ql.el index 90586c3..7d85493 100644 --- a/org-ql.el +++ b/org-ql.el @@ -3,7 +3,7 @@ ;; Author: Adam Porter ;; Url: https://github.com/alphapapa/org-ql ;; Version: 0.6-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 "1.0") (s "1.12.0") (transient "0.1") (ts "0.2-pre")) +;; Package-Requires: ((emacs "26.1") (dash "2.18") (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")) ;; Keywords: hypermedia, outlines, Org, agenda ;;; Commentary: @@ -41,7 +41,6 @@ (require 'subr-x) (require 'dash) -(require 'dash-functional) (require 'map) (require 'ts) From 21b3bd2d6ad2886908f6d4cab662f363ae3687ee Mon Sep 17 00:00:00 2001 From: Mark Hudnall Date: Sun, 28 Feb 2021 15:02:34 -0800 Subject: [PATCH 2/3] Change: Bump dash.el to fix helm-org-ql See https://github.com/alphapapa/org-ql/issues/179. dash.el 2.18.1 fixed an issue with `-flatten-n` that was causing `helm-org-ql` functions to fail silently. --- helm-org-ql.el | 2 +- org-ql.el | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/helm-org-ql.el b/helm-org-ql.el index bd3a17c..6757488 100644 --- a/helm-org-ql.el +++ b/helm-org-ql.el @@ -3,7 +3,7 @@ ;; Author: Adam Porter ;; URL: https://github.com/alphapapa/org-ql ;; Version: 0.6-pre -;; Package-Requires: ((emacs "26.1") (dash "2.18.0") (s "1.12.0") (helm-org "1.0") (org-ql "0.6-pre")) +;; Package-Requires: ((emacs "26.1") (dash "2.18.1") (s "1.12.0") (helm-org "1.0") (org-ql "0.6-pre")) ;;; Commentary: diff --git a/org-ql.el b/org-ql.el index 7d85493..2025f0b 100644 --- a/org-ql.el +++ b/org-ql.el @@ -3,7 +3,7 @@ ;; Author: Adam Porter ;; Url: https://github.com/alphapapa/org-ql ;; Version: 0.6-pre -;; Package-Requires: ((emacs "26.1") (dash "2.18") (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") (s "1.12.0") (transient "0.1") (ts "0.2-pre")) ;; Keywords: hypermedia, outlines, Org, agenda ;;; Commentary: From 7b701cc379f1c8aaa1ddbefc310e154fafa9381d Mon Sep 17 00:00:00 2001 From: Adam Porter Date: Tue, 8 Jun 2021 10:29:39 -0500 Subject: [PATCH 3/3] Docs: Update changelog --- README.org | 1 + org-ql.info | 56 +++++++++++++++++++++++++++++++---------------------- 2 files changed, 34 insertions(+), 23 deletions(-) diff --git a/README.org b/README.org index c91c9d5..353e398 100644 --- a/README.org +++ b/README.org @@ -525,6 +525,7 @@ Simple links may also be written manually in either sexp or non-sexp form, like: *Changed* + Helm support (including the command =helm-org-ql=) has been moved to a separate package, =helm-org-ql=. + Predicate ~heading~ now matches plain strings instead of regular expressions. ++ Update =dash= dependency, and remove dependency on obsolete =dash-functional=. (Fixes [[https://github.com/alphapapa/org-ql/issues/179][#179]], [[https://github.com/alphapapa/org-ql/issues/209][#209]]. Thanks to [[https://github.com/landakram][Mark Hudnall]], [[https://github.com/akirak][Akira Komamura]], [[https://github.com/natask][Nathanael kinfe]], [[https://github.com/benthamite][Pablo Stafforini]], [[https://github.com/jmay][Jason May]], and [[https://github.com/basil-conto][Basil L. Contovounesios]].) *Internal* + Predicates are now defined more cleanly with a macro (=org-ql-defpred=) that consolidates functionality related to each predicate. This will also allow users to more easily define custom predicates. diff --git a/org-ql.info b/org-ql.info index 3a6d274..a37949c 100644 --- a/org-ql.info +++ b/org-ql.info @@ -974,6 +974,16 @@ File: README.info, Node: 06-pre, Next: 05, Up: Changelog a separate package, helm-org-ql. • Predicate ‘heading’ now matches plain strings instead of regular expressions. + • Update dash dependency, and remove dependency on obsolete + dash-functional. (Fixes #179 + (https://github.com/alphapapa/org-ql/issues/179), #209 + (https://github.com/alphapapa/org-ql/issues/209). Thanks to Mark + Hudnall (https://github.com/landakram), Akira Komamura + (https://github.com/akirak), Nathanael kinfe + (https://github.com/natask), Pablo Stafforini + (https://github.com/benthamite), Jason May + (https://github.com/jmay), and Basil L. Contovounesios + (https://github.com/basil-conto).) *Internal* • Predicates are now defined more cleanly with a macro @@ -1496,29 +1506,29 @@ Node: Links34102 Node: Tips34789 Node: Changelog35107 Node: 06-pre35803 -Node: 0536638 -Node: 04938115 -Node: 04838389 -Node: 04738736 -Node: 04639131 -Node: 04539531 -Node: 04439890 -Node: 04340247 -Node: 04240442 -Node: 04140603 -Node: 0440844 -Node: 03244777 -Node: 03145156 -Node: 0345353 -Node: 02348328 -Node: 02248556 -Node: 02148824 -Node: 0249023 -Node: 0153058 -Node: Notes53159 -Node: Comparison with Org Agenda searches53321 -Node: org-sidebar54193 -Node: License54472 +Node: 0537178 +Node: 04938655 +Node: 04838929 +Node: 04739276 +Node: 04639671 +Node: 04540071 +Node: 04440430 +Node: 04340787 +Node: 04240982 +Node: 04141143 +Node: 0441384 +Node: 03245317 +Node: 03145696 +Node: 0345893 +Node: 02348868 +Node: 02249096 +Node: 02149364 +Node: 0249563 +Node: 0153598 +Node: Notes53699 +Node: Comparison with Org Agenda searches53861 +Node: org-sidebar54733 +Node: License55012  End Tag Table