Merge: 0.5.2

NOTE: Due to changes between 0.5 and 0.6, the fixes don't merge
cleanly, so they will be applied in subsequent commits.  See #220.

README.org

@@ -531,6 +531,11 @@ Simple links may also be written manually in either sexp or non-sexp form, like:
 +  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.
 +  Version 1.0 of library ~peg~ is now required.
 
+** 0.5.2
+
+*Fixed*
++  Predicate ~link~'s ~:target~ and ~:regexp-p~ arguments.  ([[https://github.com/alphapapa/org-ql/pull/220][#220]].  Thanks to [[https://github.com/akirak][Akira Komamura]].)
+
 ** 0.5.1
 
 *Fixed*

org-ql.info

@@ -70,6 +70,7 @@ Functions / Macros
 Changelog
 
 * 0.6-pre: 06-pre. 
+* 0.5.2: 052. 
 * 0.5.1: 051. 
 * 0.5: 05. 
 * 0.4.9: 049. 
@@ -938,6 +939,7 @@ releases.
 * Menu:
 
 * 0.6-pre: 06-pre. 
+* 0.5.2: 052. 
 * 0.5.1: 051. 
 * 0.5: 05. 
 * 0.4.9: 049. 
@@ -960,7 +962,7 @@ releases.
 * 0.1: 01. 
 
 
-File: README.info,  Node: 06-pre,  Next: 051,  Up: Changelog
+File: README.info,  Node: 06-pre,  Next: 052,  Up: Changelog
 
 5.1 0.6-pre
 ===========
@@ -995,9 +997,20 @@ File: README.info,  Node: 06-pre,  Next: 051,  Up: Changelog
    • Version 1.0 of library ‘peg’ is now required.
 
 
-File: README.info,  Node: 051,  Next: 05,  Prev: 06-pre,  Up: Changelog
+File: README.info,  Node: 052,  Next: 051,  Prev: 06-pre,  Up: Changelog
 
-5.2 0.5.1
+5.2 0.5.2
+=========
+
+*Fixed*
+   • Predicate ‘link’’s ‘:target’ and ‘:regexp-p’ arguments.  (#220
+     (https://github.com/alphapapa/org-ql/pull/220).  Thanks to Akira
+     Komamura (https://github.com/akirak).)
+
+
+File: README.info,  Node: 051,  Next: 05,  Prev: 052,  Up: Changelog
+
+5.3 0.5.1
 =========
 
 *Fixed*
@@ -1010,7 +1023,7 @@ File: README.info,  Node: 051,  Next: 05,  Prev: 06-pre,  Up: Changelog
 
 File: README.info,  Node: 05,  Next: 049,  Prev: 051,  Up: Changelog
 
-5.3 0.5
+5.4 0.5
 =======
 
 *Added*
@@ -1051,7 +1064,7 @@ File: README.info,  Node: 05,  Next: 049,  Prev: 051,  Up: Changelog
 
 File: README.info,  Node: 049,  Next: 048,  Prev: 05,  Up: Changelog
 
-5.4 0.4.9
+5.5 0.4.9
 =========
 
 *Fixed*
@@ -1062,7 +1075,7 @@ File: README.info,  Node: 049,  Next: 048,  Prev: 05,  Up: Changelog
 
 File: README.info,  Node: 048,  Next: 047,  Prev: 049,  Up: Changelog
 
-5.5 0.4.8
+5.6 0.4.8
 =========
 
 *Fixed*
@@ -1074,7 +1087,7 @@ File: README.info,  Node: 048,  Next: 047,  Prev: 049,  Up: Changelog
 
 File: README.info,  Node: 047,  Next: 046,  Prev: 048,  Up: Changelog
 
-5.6 0.4.7
+5.7 0.4.7
 =========
 
 *Fixed*
@@ -1087,7 +1100,7 @@ File: README.info,  Node: 047,  Next: 046,  Prev: 048,  Up: Changelog
 
 File: README.info,  Node: 046,  Next: 045,  Prev: 047,  Up: Changelog
 
-5.7 0.4.6
+5.8 0.4.6
 =========
 
 *Fixed*
@@ -1100,7 +1113,7 @@ File: README.info,  Node: 046,  Next: 045,  Prev: 047,  Up: Changelog
 
 File: README.info,  Node: 045,  Next: 044,  Prev: 046,  Up: Changelog
 
-5.8 0.4.5
+5.9 0.4.5
 =========
 
 *Fixed*
@@ -1112,8 +1125,8 @@ File: README.info,  Node: 045,  Next: 044,  Prev: 046,  Up: Changelog
 
 File: README.info,  Node: 044,  Next: 043,  Prev: 045,  Up: Changelog
 
-5.9 0.4.4
+5.10 0.4.4
-=========
+==========
 
 *Fixed*
    • Compatibility with Org Agenda remote editing commands (some of
@@ -1124,7 +1137,7 @@ File: README.info,  Node: 044,  Next: 043,  Prev: 045,  Up: Changelog
 
 File: README.info,  Node: 043,  Next: 042,  Prev: 044,  Up: Changelog
 
-5.10 0.4.3
+5.11 0.4.3
 ==========
 
 *Fixed*
@@ -1134,7 +1147,7 @@ File: README.info,  Node: 043,  Next: 042,  Prev: 044,  Up: Changelog
 
 File: README.info,  Node: 042,  Next: 041,  Prev: 043,  Up: Changelog
 
-5.11 0.4.2
+5.12 0.4.2
 ==========
 
 *Fixed*
@@ -1143,7 +1156,7 @@ File: README.info,  Node: 042,  Next: 041,  Prev: 043,  Up: Changelog
 
 File: README.info,  Node: 041,  Next: 04,  Prev: 042,  Up: Changelog
 
-5.12 0.4.1
+5.13 0.4.1
 ==========
 
 *Fixed*
@@ -1153,7 +1166,7 @@ File: README.info,  Node: 041,  Next: 04,  Prev: 042,  Up: Changelog
 
 File: README.info,  Node: 04,  Next: 032,  Prev: 041,  Up: Changelog
 
-5.13 0.4
+5.14 0.4
 ========
 
 _Note:_ The next release, 0.5, may include changes which will require
@@ -1234,7 +1247,7 @@ as they will be pushed to the master branch when ready.
 
 File: README.info,  Node: 032,  Next: 031,  Prev: 04,  Up: Changelog
 
-5.14 0.3.2
+5.15 0.3.2
 ==========
 
 *Fixed*
@@ -1247,7 +1260,7 @@ File: README.info,  Node: 032,  Next: 031,  Prev: 04,  Up: Changelog
 
 File: README.info,  Node: 031,  Next: 03,  Prev: 032,  Up: Changelog
 
-5.15 0.3.1
+5.16 0.3.1
 ==========
 
 *Fixed*
@@ -1257,7 +1270,7 @@ File: README.info,  Node: 031,  Next: 03,  Prev: 032,  Up: Changelog
 
 File: README.info,  Node: 03,  Next: 023,  Prev: 031,  Up: Changelog
 
-5.16 0.3
+5.17 0.3
 ========
 
 *Added*
@@ -1322,7 +1335,7 @@ File: README.info,  Node: 03,  Next: 023,  Prev: 031,  Up: Changelog
 
 File: README.info,  Node: 023,  Next: 022,  Prev: 03,  Up: Changelog
 
-5.17 0.2.3
+5.18 0.2.3
 ==========
 
 *Fixed*
@@ -1332,7 +1345,7 @@ File: README.info,  Node: 023,  Next: 022,  Prev: 03,  Up: Changelog
 
 File: README.info,  Node: 022,  Next: 021,  Prev: 023,  Up: Changelog
 
-5.18 0.2.2
+5.19 0.2.2
 ==========
 
 *Fixed*
@@ -1343,7 +1356,7 @@ File: README.info,  Node: 022,  Next: 021,  Prev: 023,  Up: Changelog
 
 File: README.info,  Node: 021,  Next: 02,  Prev: 022,  Up: Changelog
 
-5.19 0.2.1
+5.20 0.2.1
 ==========
 
 *Fixed*
@@ -1353,7 +1366,7 @@ File: README.info,  Node: 021,  Next: 02,  Prev: 022,  Up: Changelog
 
 File: README.info,  Node: 02,  Next: 01,  Prev: 021,  Up: Changelog
 
-5.20 0.2
+5.21 0.2
 ========
 
 *Added*
@@ -1436,7 +1449,7 @@ File: README.info,  Node: 02,  Next: 01,  Prev: 021,  Up: Changelog
 
 File: README.info,  Node: 01,  Prev: 02,  Up: Changelog
 
-5.21 0.1
+5.22 0.1
 ========
 
 First tagged release.
@@ -1494,57 +1507,58 @@ GPLv3
 
 Tag Table:
 Node: Top225
-Node: Contents1682
+Node: Contents1697
-Node: Screenshots1805
+Node: Screenshots1820
-Node: Installation1923
+Node: Installation1938
-Node: Quelpa2419
+Node: Quelpa2434
-Node: Helm support2947
+Node: Helm support2962
-Node: Usage3338
+Node: Usage3353
-Node: Commands3736
+Node: Commands3751
-Node: org-ql-search4209
+Node: org-ql-search4224
-Node: helm-org-ql5859
+Node: helm-org-ql5874
-Node: org-ql-view6219
+Node: org-ql-view6234
-Node: org-ql-view-sidebar6719
+Node: org-ql-view-sidebar6734
-Node: org-ql-view-recent-items7075
+Node: org-ql-view-recent-items7090
-Node: org-ql-sparse-tree7559
+Node: org-ql-sparse-tree7574
-Node: Queries8359
+Node: Queries8374
-Node: Non-sexp query syntax9470
+Node: Non-sexp query syntax9485
-Node: General predicates11177
+Node: General predicates11192
-Node: Ancestor/descendant predicates16820
+Node: Ancestor/descendant predicates16835
-Node: Date/time predicates17948
+Node: Date/time predicates17963
-Node: Functions / Macros20603
+Node: Functions / Macros20618
-Node: Agenda-like views20901
+Node: Agenda-like views20916
-Node: Listing / acting-on results22306
+Node: Listing / acting-on results22321
-Node: Custom predicates27928
+Node: Custom predicates27943
-Node: Dynamic block31419
+Node: Dynamic block31434
-Node: Links34117
+Node: Links34132
-Node: Tips34804
+Node: Tips34819
-Node: Changelog35122
+Node: Changelog35137
-Node: 06-pre35833
+Node: 06-pre35863
-Node: 05137209
+Node: 05237239
-Node: 0537629
+Node: 05137543
-Node: 04939103
+Node: 0537960
-Node: 04839377
+Node: 04939434
-Node: 04739724
+Node: 04839708
-Node: 04640119
+Node: 04740055
-Node: 04540519
+Node: 04640450
-Node: 04440878
+Node: 04540850
-Node: 04341235
+Node: 04441209
-Node: 04241432
+Node: 04341568
-Node: 04141593
+Node: 04241765
-Node: 0441834
+Node: 04141926
-Node: 03245767
+Node: 0442167
-Node: 03146146
+Node: 03246100
-Node: 0346343
+Node: 03146479
-Node: 02349318
+Node: 0346676
-Node: 02249546
+Node: 02349651
-Node: 02149814
+Node: 02249879
-Node: 0250013
+Node: 02150147
-Node: 0154048
+Node: 0250346
-Node: Notes54149
+Node: 0154381
-Node: Comparison with Org Agenda searches54311
+Node: Notes54482
-Node: org-sidebar55183
+Node: Comparison with Org Agenda searches54644
-Node: License55462
+Node: org-sidebar55516
+Node: License55795
 
 End Tag Table
 

tests/data.org

@@ -81,7 +81,7 @@ SCHEDULED: <2017-07-05 Wed>
 
 If I don't, the frobnicator will probably fall off halfway to Mars...
 
-Gotta buy one first, though.
+Gotta buy one first, though.  [[https://example.com/][This one]] looks suitable.
 
 * Recurring
 :PROPERTIES:

tests/test-org-ql.el

@@ -669,7 +669,7 @@ RESULTS should be a list of strings as returned by
     (describe "(link)"
       (org-ql-it "without arguments"
         (org-ql-expect ('(link))
-          '("/r/emacs")))
+          '("Fix flux capacitor" "/r/emacs")))
       (org-ql-it "with description-or-target"
         (org-ql-expect ('(link "emacs"))
           '("/r/emacs")))
@@ -681,6 +681,18 @@ RESULTS should be a list of strings as returned by
           '("/r/emacs")))
       (org-ql-it "with :description and :target"
         (org-ql-expect ('(link :description "emacs" :target "reddit.com"))
+          '("/r/emacs")))
+      (org-ql-it "with description-or-target regexp"
+        (org-ql-expect ('(link "em.cs" :regexp-p t))
+          '("/r/emacs")))
+      (org-ql-it "with :description regexp"
+        (org-ql-expect ('(link :description "em.cs" :regexp-p t))
+          '("/r/emacs")))
+      (org-ql-it "with :target regexp"
+        (org-ql-expect ('(link :target "em.cs" :regexp-p t))
+          '("/r/emacs")))
+      (org-ql-it "with :description and :target regexp"
+        (org-ql-expect ('(link :description "em.cs" :target "em.cs" :regexp-p t))
           '("/r/emacs"))))
 
     (describe "(outline-path)"