Skip to content

Commit d3b0ef2

Browse files
alphapapaalphapapa
committed
Release: 0.5.2
2 parents 3a04b10 + eead60b commit d3b0ef2

File tree

5 files changed

+116
-78
lines changed

5 files changed

+116
-78
lines changed

‎README.org

+5
Original file line numberDiff line numberDiff line change
@@ -461,6 +461,11 @@ Simple links may also be written manually in either sexp or non-sexp form, like:
461461

462462
/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.
463463

464+
** 0.5.2
465+
466+
*Fixed*
467+
+ 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]].)
468+
464469
** 0.5.1
465470

466471
*Fixed*

‎org-ql.el

+13-6
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
;; Author: Adam Porter <[email protected]>
44
;; Url: https://github.com/alphapapa/org-ql
5-
;; Version: 0.5.1
5+
;; Version: 0.5.2-pre
66
;; 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"))
77
;; Keywords: hypermedia, outlines, Org, agenda
88

@@ -810,19 +810,26 @@ replace the clause with a preamble."
810810
;; have to use `plist-get' here for now. Maybe when we drop
811811
;; support for Emacs <28...
812812
(`(link ,(and description-or-target
813-
(guard (not (keywordp description-or-target)))))
813+
(guard (not (keywordp description-or-target))))
814+
. ,plist)
814815
(setq org-ql-preamble
815816
(org-ql--link-regexp :description-or-target
816-
(regexp-quote description-or-target)))
817+
(if (plist-get plist :regexp-p)
818+
description-or-target
819+
(regexp-quote description-or-target))))
817820
nil)
818821
(`(link . ,plist)
819822
(setq org-ql-preamble
820823
(org-ql--link-regexp
821824
:description
822825
(when (plist-get plist :description)
823-
(regexp-quote (plist-get plist :description)))
826+
(if (plist-get plist :regexp-p)
827+
(plist-get plist :description)
828+
(regexp-quote (plist-get plist :description))))
824829
:target (when (plist-get plist :target)
825-
(regexp-quote (plist-get plist :target)))))
830+
(if (plist-get plist :regexp-p)
831+
(plist-get plist :target)
832+
(regexp-quote (plist-get plist :target))))))
826833
nil)
827834

828835
;; Planning lines.
@@ -1250,7 +1257,7 @@ any link is found."
12501257
plist (cdr args))
12511258
(setf plist args))
12521259
(setf description (plist-get plist :description)
1253-
target (plist-get plist :description)
1260+
target (plist-get plist :target)
12541261
regexp-p (plist-get plist :regexp-p))
12551262
(unless regexp-p
12561263
;; NOTE: It would also be preferable to avoid regexp-quoting every time this predicate

‎org-ql.info

+84-70
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@ Functions / Macros
6666

6767
Changelog
6868

69+
* 0.5.2: 052.
6970
* 0.5.1: 051.
7071
* 0.5: 05.
7172
* 0.4.9: 049.
@@ -832,6 +833,7 @@ releases.
832833

833834
* Menu:
834835

836+
* 0.5.2: 052.
835837
* 0.5.1: 051.
836838
* 0.5: 05.
837839
* 0.4.9: 049.
@@ -854,9 +856,20 @@ releases.
854856
* 0.1: 01.
855857

856858

857-
File: README.info, Node: 051, Next: 05, Up: Changelog
859+
File: README.info, Node: 052, Next: 051, Up: Changelog
858860

859-
5.1 0.5.1
861+
5.1 0.5.2
862+
=========
863+
864+
*Fixed*
865+
• Predicate ‘link’’s ‘:target’ and ‘:regexp-p’ arguments. (#220
866+
(https://github.com/alphapapa/org-ql/pull/220). Thanks to Akira
867+
Komamura (https://github.com/akirak).)
868+
869+

870+
File: README.info, Node: 051, Next: 05, Prev: 052, Up: Changelog
871+
872+
5.2 0.5.1
860873
=========
861874

862875
*Fixed*
@@ -869,7 +882,7 @@ File: README.info, Node: 051, Next: 05, Up: Changelog
869882

870883
File: README.info, Node: 05, Next: 049, Prev: 051, Up: Changelog
871884

872-
5.2 0.5
885+
5.3 0.5
873886
=======
874887

875888
*Added*
@@ -910,7 +923,7 @@ File: README.info, Node: 05, Next: 049, Prev: 051, Up: Changelog
910923

911924
File: README.info, Node: 049, Next: 048, Prev: 05, Up: Changelog
912925

913-
5.3 0.4.9
926+
5.4 0.4.9
914927
=========
915928

916929
*Fixed*
@@ -921,7 +934,7 @@ File: README.info, Node: 049, Next: 048, Prev: 05, Up: Changelog
921934

922935
File: README.info, Node: 048, Next: 047, Prev: 049, Up: Changelog
923936

924-
5.4 0.4.8
937+
5.5 0.4.8
925938
=========
926939

927940
*Fixed*
@@ -933,7 +946,7 @@ File: README.info, Node: 048, Next: 047, Prev: 049, Up: Changelog
933946

934947
File: README.info, Node: 047, Next: 046, Prev: 048, Up: Changelog
935948

936-
5.5 0.4.7
949+
5.6 0.4.7
937950
=========
938951

939952
*Fixed*
@@ -946,7 +959,7 @@ File: README.info, Node: 047, Next: 046, Prev: 048, Up: Changelog
946959

947960
File: README.info, Node: 046, Next: 045, Prev: 047, Up: Changelog
948961

949-
5.6 0.4.6
962+
5.7 0.4.6
950963
=========
951964

952965
*Fixed*
@@ -959,7 +972,7 @@ File: README.info, Node: 046, Next: 045, Prev: 047, Up: Changelog
959972

960973
File: README.info, Node: 045, Next: 044, Prev: 046, Up: Changelog
961974

962-
5.7 0.4.5
975+
5.8 0.4.5
963976
=========
964977

965978
*Fixed*
@@ -971,7 +984,7 @@ File: README.info, Node: 045, Next: 044, Prev: 046, Up: Changelog
971984

972985
File: README.info, Node: 044, Next: 043, Prev: 045, Up: Changelog
973986

974-
5.8 0.4.4
987+
5.9 0.4.4
975988
=========
976989

977990
*Fixed*
@@ -983,8 +996,8 @@ File: README.info, Node: 044, Next: 043, Prev: 045, Up: Changelog
983996

984997
File: README.info, Node: 043, Next: 042, Prev: 044, Up: Changelog
985998

986-
5.9 0.4.3
987-
=========
999+
5.10 0.4.3
1000+
==========
9881001

9891002
*Fixed*
9901003
• When org-ql-view-refresh is called, ensure the buffer is an Org QL
@@ -993,7 +1006,7 @@ File: README.info, Node: 043, Next: 042, Prev: 044, Up: Changelog
9931006

9941007
File: README.info, Node: 042, Next: 041, Prev: 043, Up: Changelog
9951008

996-
5.10 0.4.2
1009+
5.11 0.4.2
9971010
==========
9981011

9991012
*Fixed*
@@ -1002,7 +1015,7 @@ File: README.info, Node: 042, Next: 041, Prev: 043, Up: Changelog
10021015

10031016
File: README.info, Node: 041, Next: 04, Prev: 042, Up: Changelog
10041017

1005-
5.11 0.4.1
1018+
5.12 0.4.1
10061019
==========
10071020

10081021
*Fixed*
@@ -1012,7 +1025,7 @@ File: README.info, Node: 041, Next: 04, Prev: 042, Up: Changelog
10121025

10131026
File: README.info, Node: 04, Next: 032, Prev: 041, Up: Changelog
10141027

1015-
5.12 0.4
1028+
5.13 0.4
10161029
========
10171030

10181031
_Note:_ The next release, 0.5, may include changes which will require
@@ -1093,7 +1106,7 @@ as they will be pushed to the master branch when ready.
10931106

10941107
File: README.info, Node: 032, Next: 031, Prev: 04, Up: Changelog
10951108

1096-
5.13 0.3.2
1109+
5.14 0.3.2
10971110
==========
10981111

10991112
*Fixed*
@@ -1106,7 +1119,7 @@ File: README.info, Node: 032, Next: 031, Prev: 04, Up: Changelog
11061119

11071120
File: README.info, Node: 031, Next: 03, Prev: 032, Up: Changelog
11081121

1109-
5.14 0.3.1
1122+
5.15 0.3.1
11101123
==========
11111124

11121125
*Fixed*
@@ -1116,7 +1129,7 @@ File: README.info, Node: 031, Next: 03, Prev: 032, Up: Changelog
11161129

11171130
File: README.info, Node: 03, Next: 023, Prev: 031, Up: Changelog
11181131

1119-
5.15 0.3
1132+
5.16 0.3
11201133
========
11211134

11221135
*Added*
@@ -1181,7 +1194,7 @@ File: README.info, Node: 03, Next: 023, Prev: 031, Up: Changelog
11811194

11821195
File: README.info, Node: 023, Next: 022, Prev: 03, Up: Changelog
11831196

1184-
5.16 0.2.3
1197+
5.17 0.2.3
11851198
==========
11861199

11871200
*Fixed*
@@ -1191,7 +1204,7 @@ File: README.info, Node: 023, Next: 022, Prev: 03, Up: Changelog
11911204

11921205
File: README.info, Node: 022, Next: 021, Prev: 023, Up: Changelog
11931206

1194-
5.17 0.2.2
1207+
5.18 0.2.2
11951208
==========
11961209

11971210
*Fixed*
@@ -1202,7 +1215,7 @@ File: README.info, Node: 022, Next: 021, Prev: 023, Up: Changelog
12021215

12031216
File: README.info, Node: 021, Next: 02, Prev: 022, Up: Changelog
12041217

1205-
5.18 0.2.1
1218+
5.19 0.2.1
12061219
==========
12071220

12081221
*Fixed*
@@ -1212,7 +1225,7 @@ File: README.info, Node: 021, Next: 02, Prev: 022, Up: Changelog
12121225

12131226
File: README.info, Node: 02, Next: 01, Prev: 021, Up: Changelog
12141227

1215-
5.19 0.2
1228+
5.20 0.2
12161229
========
12171230

12181231
*Added*
@@ -1295,7 +1308,7 @@ File: README.info, Node: 02, Next: 01, Prev: 021, Up: Changelog
12951308

12961309
File: README.info, Node: 01, Prev: 02, Up: Changelog
12971310

1298-
5.20 0.1
1311+
5.21 0.1
12991312
========
13001313

13011314
First tagged release.
@@ -1353,54 +1366,55 @@ GPLv3
13531366

13541367
Tag Table:
13551368
Node: Top225
1356-
Node: Contents1601
1357-
Node: Screenshots1724
1358-
Node: Installation1842
1359-
Node: Quelpa2480
1360-
Node: Usage2923
1361-
Node: Commands3321
1362-
Node: org-ql-search3794
1363-
Node: helm-org-ql5444
1364-
Node: org-ql-view5856
1365-
Node: org-ql-view-sidebar6356
1366-
Node: org-ql-view-recent-items6712
1367-
Node: org-ql-sparse-tree7196
1368-
Node: Queries7996
1369-
Node: Non-sexp query syntax9107
1370-
Node: General predicates10814
1371-
Node: Ancestor/descendant predicates16227
1372-
Node: Date/time predicates17355
1373-
Node: Functions / Macros20010
1374-
Node: Agenda-like views20265
1375-
Node: Listing / acting-on results21670
1376-
Node: Dynamic block26865
1377-
Node: Links29563
1378-
Node: Tips30250
1379-
Node: Changelog30568
1380-
Node: 05131259
1381-
Node: 0531664
1382-
Node: 04933138
1383-
Node: 04833412
1384-
Node: 04733759
1385-
Node: 04634154
1386-
Node: 04534554
1387-
Node: 04434913
1388-
Node: 04335270
1389-
Node: 04235465
1390-
Node: 04135626
1391-
Node: 0435867
1392-
Node: 03239800
1393-
Node: 03140179
1394-
Node: 0340376
1395-
Node: 02343351
1396-
Node: 02243579
1397-
Node: 02143847
1398-
Node: 0244046
1399-
Node: 0148081
1400-
Node: Notes48182
1401-
Node: Comparison with Org Agenda searches48344
1402-
Node: org-sidebar49216
1403-
Node: License49495
1369+
Node: Contents1616
1370+
Node: Screenshots1739
1371+
Node: Installation1857
1372+
Node: Quelpa2495
1373+
Node: Usage2938
1374+
Node: Commands3336
1375+
Node: org-ql-search3809
1376+
Node: helm-org-ql5459
1377+
Node: org-ql-view5871
1378+
Node: org-ql-view-sidebar6371
1379+
Node: org-ql-view-recent-items6727
1380+
Node: org-ql-sparse-tree7211
1381+
Node: Queries8011
1382+
Node: Non-sexp query syntax9122
1383+
Node: General predicates10829
1384+
Node: Ancestor/descendant predicates16242
1385+
Node: Date/time predicates17370
1386+
Node: Functions / Macros20025
1387+
Node: Agenda-like views20280
1388+
Node: Listing / acting-on results21685
1389+
Node: Dynamic block26880
1390+
Node: Links29578
1391+
Node: Tips30265
1392+
Node: Changelog30583
1393+
Node: 05231289
1394+
Node: 05131578
1395+
Node: 0531995
1396+
Node: 04933469
1397+
Node: 04833743
1398+
Node: 04734090
1399+
Node: 04634485
1400+
Node: 04534885
1401+
Node: 04435244
1402+
Node: 04335601
1403+
Node: 04235798
1404+
Node: 04135959
1405+
Node: 0436200
1406+
Node: 03240133
1407+
Node: 03140512
1408+
Node: 0340709
1409+
Node: 02343684
1410+
Node: 02243912
1411+
Node: 02144180
1412+
Node: 0244379
1413+
Node: 0148414
1414+
Node: Notes48515
1415+
Node: Comparison with Org Agenda searches48677
1416+
Node: org-sidebar49549
1417+
Node: License49828
14041418

14051419
End Tag Table
14061420

‎tests/data.org

+1-1
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ SCHEDULED: <2017-07-05 Wed>
8181

8282
If I don't, the frobnicator will probably fall off halfway to Mars...
8383

84-
Gotta buy one first, though.
84+
Gotta buy one first, though. [[https://example.com/][This one]] looks suitable.
8585

8686
* Recurring
8787
:PROPERTIES:

0 commit comments

Comments
 (0)