From 140aa891f488a733f3976fc07f85a02b4b4f69f4 Mon Sep 17 00:00:00 2001
From: Adam Porter <adam@alphapapa.net>
Date: Wed, 22 Sep 2021 01:08:54 -0500
Subject: [PATCH] Remove: Obsolete macro org-ql

---
 README.org           |  3 +++
 org-ql.el            | 14 ------------
 org-ql.info          | 54 ++++++++++++++++++++++++--------------------
 tests/test-org-ql.el |  6 -----
 4 files changed, 32 insertions(+), 45 deletions(-)

diff --git a/README.org b/README.org
index 8377261..636e6e3 100644
--- a/README.org
+++ b/README.org
@@ -541,6 +541,9 @@ Simple links may also be written manually in either sexp or non-sexp form, like:
 +  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]].)
 
+*Removed*
++  Obsolete macro ~org-ql~ (obsolete since 0.5, replaced by functions ~org-ql-select~ and ~org-ql-query~).
+
 *Fixed*
 +  Timestamp-related predicates called with relative-date arguments did not properly invalidate the query cache.  (Fixes [[https://github.com/alphapapa/org-ql/issues/223][#223]].  Thanks to [[https://github.com/yantar92][Ihor Radchenko]] for reporting.)
 
diff --git a/org-ql.el b/org-ql.el
index fab2818..9b0b9a4 100644
--- a/org-ql.el
+++ b/org-ql.el
@@ -298,20 +298,6 @@ See Info node `(org-ql)Queries'."
   :type 'boolean
   :risky t)
 
-;;;; Macros
-
-;;;###autoload
-(cl-defmacro org-ql (buffers-or-files query &key sort narrow action)
-  "Expands into a call to `org-ql-select' with the same arguments.
-For convenience, arguments should be unquoted."
-  (declare (indent defun)
-           (obsolete "Please use functions `org-ql-select' or `org-ql-query' instead" "org-ql 0.5"))
-  `(org-ql-select ,buffers-or-files
-     ',query
-     :action ',action
-     :narrow ,narrow
-     :sort ',sort))
-
 ;;;; Functions
 
 ;;;;; Query execution
diff --git a/org-ql.info b/org-ql.info
index 9f9d422..84d9a94 100644
--- a/org-ql.info
+++ b/org-ql.info
@@ -1025,6 +1025,10 @@ File: README.info,  Node: 06-pre,  Next: 052,  Up: Changelog
      (https://github.com/jmay), and Basil L. Contovounesios
      (https://github.com/basil-conto).)
 
+   *Removed*
+   • Obsolete macro ‘org-ql’ (obsolete since 0.5, replaced by functions
+     ‘org-ql-select’ and ‘org-ql-query’).
+
    *Fixed*
    • Timestamp-related predicates called with relative-date arguments
      did not properly invalidate the query cache.  (Fixes #223
@@ -1581,31 +1585,31 @@ Node: Links35356
 Node: Tips36043
 Node: Changelog36361
 Node: 06-pre37087
-Node: 05239956
-Node: 05140260
-Node: 0540677
-Node: 04942151
-Node: 04842425
-Node: 04742772
-Node: 04643167
-Node: 04543567
-Node: 04443926
-Node: 04344285
-Node: 04244482
-Node: 04144643
-Node: 0444884
-Node: 03248817
-Node: 03149196
-Node: 0349393
-Node: 02352368
-Node: 02252596
-Node: 02152864
-Node: 0253063
-Node: 0157098
-Node: Notes57199
-Node: Comparison with Org Agenda searches57361
-Node: org-sidebar58233
-Node: License58512
+Node: 05240098
+Node: 05140402
+Node: 0540819
+Node: 04942293
+Node: 04842567
+Node: 04742914
+Node: 04643309
+Node: 04543709
+Node: 04444068
+Node: 04344427
+Node: 04244624
+Node: 04144785
+Node: 0445026
+Node: 03248959
+Node: 03149338
+Node: 0349535
+Node: 02352510
+Node: 02252738
+Node: 02153006
+Node: 0253205
+Node: 0157240
+Node: Notes57341
+Node: Comparison with Org Agenda searches57503
+Node: org-sidebar58375
+Node: License58654
 
 End Tag Table
 
diff --git a/tests/test-org-ql.el b/tests/test-org-ql.el
index cd0a846..0b7f2bb 100644
--- a/tests/test-org-ql.el
+++ b/tests/test-org-ql.el
@@ -207,12 +207,6 @@ with keyword arg NOW in PLIST."
 
   (describe "Query functions/macros"
 
-    (it "org-ql"
-      ;; FIXME: Remove when org-ql macro is removed.
-      (expect (length (org-ql org-ql-test-buffer
-                        (category)
-                        :sort deadline))
-              :to-equal org-ql-test-num-headings))
     (it "org-ql-select"
       (expect (length (org-ql-select org-ql-test-buffer
                         '(category)