From 4b1e253ee910a177733c0230ffe63e9ab1cd3798 Mon Sep 17 00:00:00 2001 From: Adam Porter Date: Wed, 26 Feb 2020 19:11:40 -0600 Subject: [PATCH] Fix: (org-ql-view--add-todo-face) Always return to-do keyword Even when org-done-keywords-for-agenda is nil. I'm not sure when this was broken, but the logic was wrong in this function, and this is the intended behavior, so this is a bug fix. Released as 0.4.2. --- README.org | 5 +++ org-ql-view.el | 10 +++-- org-ql.el | 2 +- org-ql.info | 106 +++++++++++++++++++++++++++---------------------- 4 files changed, 71 insertions(+), 52 deletions(-) diff --git a/README.org b/README.org index e7c43e2..180138f 100644 --- a/README.org +++ b/README.org @@ -398,6 +398,11 @@ Expands into a call to ~org-ql-select~ with the same arguments. For convenience /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.4.2 + +*Fixed* ++ Items' to-do keywords were not shown in views. + ** 0.4.1 *Fixed* diff --git a/org-ql-view.el b/org-ql-view.el index f141270..1a132d7 100644 --- a/org-ql-view.el +++ b/org-ql-view.el @@ -666,10 +666,12 @@ property." element)) (defun org-ql-view--add-todo-face (keyword) - "Return KEYWORD with TODO face added." - (when-let* ((org-done-keywords org-done-keywords-for-agenda) - (face (org-get-todo-face keyword))) - (org-add-props keyword nil 'face face))) + "Return KEYWORD with Org to-do face added." + (let* ((org-done-keywords org-done-keywords-for-agenda) + (face (org-get-todo-face keyword))) + (when face + (add-text-properties 0 (length keyword) (list 'face face) keyword)) + keyword)) ;;;; Footer diff --git a/org-ql.el b/org-ql.el index 6008e8b..65f1053 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.4.1 +;; Version: 0.4.2 ;; Package-Requires: ((emacs "26.1") (dash "2.13") (dash-functional "1.2.0") (f "0.17.2") (org "9.0") (org-super-agenda "1.2-pre") (ov "1.0.6") (peg "0.6") (s "1.12.0") (ts "0.2-pre")) ;; Keywords: hypermedia, outlines, Org, agenda diff --git a/org-ql.info b/org-ql.info index 1a6a498..a64db08 100644 --- a/org-ql.info +++ b/org-ql.info @@ -63,6 +63,7 @@ Functions / Macros Changelog +* 0.4.2: 042. * 0.4.1: 041. * 0.4: 04. * 0.3.2: 032. @@ -704,6 +705,7 @@ releases. * Menu: +* 0.4.2: 042. * 0.4.1: 041. * 0.4: 04. * 0.3.2: 032. @@ -716,9 +718,18 @@ releases. * 0.1: 01.  -File: README.info, Node: 041, Next: 04, Up: Changelog +File: README.info, Node: 042, Next: 041, Up: Changelog -5.1 0.4.1 +5.1 0.4.2 +========= + +*Fixed* + • Items’ to-do keywords were not shown in views. + + +File: README.info, Node: 041, Next: 04, Prev: 042, Up: Changelog + +5.2 0.4.1 ========= *Fixed* @@ -728,7 +739,7 @@ File: README.info, Node: 041, Next: 04, Up: Changelog  File: README.info, Node: 04, Next: 032, Prev: 041, Up: Changelog -5.2 0.4 +5.3 0.4 ======= _Note:_ The next release, 0.5, may include changes which will require @@ -809,7 +820,7 @@ as they will be pushed to the master branch when ready.  File: README.info, Node: 032, Next: 031, Prev: 04, Up: Changelog -5.3 0.3.2 +5.4 0.3.2 ========= *Fixed* @@ -822,7 +833,7 @@ File: README.info, Node: 032, Next: 031, Prev: 04, Up: Changelog  File: README.info, Node: 031, Next: 03, Prev: 032, Up: Changelog -5.4 0.3.1 +5.5 0.3.1 ========= *Fixed* @@ -832,7 +843,7 @@ File: README.info, Node: 031, Next: 03, Prev: 032, Up: Changelog  File: README.info, Node: 03, Next: 023, Prev: 031, Up: Changelog -5.5 0.3 +5.6 0.3 ======= *Added* @@ -897,7 +908,7 @@ File: README.info, Node: 03, Next: 023, Prev: 031, Up: Changelog  File: README.info, Node: 023, Next: 022, Prev: 03, Up: Changelog -5.6 0.2.3 +5.7 0.2.3 ========= *Fixed* @@ -907,7 +918,7 @@ File: README.info, Node: 023, Next: 022, Prev: 03, Up: Changelog  File: README.info, Node: 022, Next: 021, Prev: 023, Up: Changelog -5.7 0.2.2 +5.8 0.2.2 ========= *Fixed* @@ -918,7 +929,7 @@ File: README.info, Node: 022, Next: 021, Prev: 023, Up: Changelog  File: README.info, Node: 021, Next: 02, Prev: 022, Up: Changelog -5.8 0.2.1 +5.9 0.2.1 ========= *Fixed* @@ -928,8 +939,8 @@ File: README.info, Node: 021, Next: 02, Prev: 022, Up: Changelog  File: README.info, Node: 02, Next: 01, Prev: 021, Up: Changelog -5.9 0.2 -======= +5.10 0.2 +======== *Added* • Function ‘org-ql-query’, like ‘org-ql-select’ but with arguments @@ -1011,7 +1022,7 @@ File: README.info, Node: 02, Next: 01, Prev: 021, Up: Changelog  File: README.info, Node: 01, Prev: 02, Up: Changelog -5.10 0.1 +5.11 0.1 ======== First tagged release. @@ -1072,41 +1083,42 @@ GPLv3  Tag Table: Node: Top225 -Node: Contents1417 -Node: Screenshots1591 -Node: Installation1709 -Node: Quelpa2347 -Node: Usage2790 -Node: Commands3139 -Node: org-ql-search3612 -Node: helm-org-ql5260 -Node: org-ql-view5672 -Node: org-ql-view-sidebar5870 -Node: org-ql-view-recent-items6226 -Node: org-ql-sparse-tree6710 -Node: Queries7510 -Node: Non-sexp query syntax8418 -Node: General predicates10125 -Node: Ancestor/descendant predicates14932 -Node: Date/time predicates16060 -Node: Functions / Macros18715 -Node: Agenda-like views18948 -Node: Listing / acting-on results20353 -Node: Changelog24955 -Node: 04125499 -Node: 0425726 -Node: 03229657 -Node: 03130034 -Node: 0330229 -Node: 02333202 -Node: 02233428 -Node: 02133694 -Node: 0233891 -Node: 0137924 -Node: Notes38025 -Node: Comparison with Org Agenda searches38187 -Node: org-sidebar39058 -Node: License39337 +Node: Contents1432 +Node: Screenshots1606 +Node: Installation1724 +Node: Quelpa2362 +Node: Usage2805 +Node: Commands3154 +Node: org-ql-search3627 +Node: helm-org-ql5275 +Node: org-ql-view5687 +Node: org-ql-view-sidebar5885 +Node: org-ql-view-recent-items6241 +Node: org-ql-sparse-tree6725 +Node: Queries7525 +Node: Non-sexp query syntax8433 +Node: General predicates10140 +Node: Ancestor/descendant predicates14947 +Node: Date/time predicates16075 +Node: Functions / Macros18730 +Node: Agenda-like views18963 +Node: Listing / acting-on results20368 +Node: Changelog24970 +Node: 04225529 +Node: 04125676 +Node: 0425915 +Node: 03229846 +Node: 03130223 +Node: 0330418 +Node: 02333391 +Node: 02233617 +Node: 02133883 +Node: 0234080 +Node: 0138115 +Node: Notes38216 +Node: Comparison with Org Agenda searches38378 +Node: org-sidebar39249 +Node: License39528  End Tag Table