From 914e64746f382436a1024cf40e5fa5c41bd37b87 Mon Sep 17 00:00:00 2001 From: Adam Porter Date: Wed, 26 Jun 2024 10:41:58 -0500 Subject: [PATCH] Fix: (org-ql-search) Interactive narrowing Fixes #430. Closes #436. Reported-by: Akira Komamura --- README.org | 1 + org-ql-search.el | 2 +- org-ql.info | 84 +++++++++++++++++++++++++----------------------- 3 files changed, 45 insertions(+), 42 deletions(-) diff --git a/README.org b/README.org index 2b73078a..c7465287 100644 --- a/README.org +++ b/README.org @@ -557,6 +557,7 @@ Simple links may also be written manually in either sexp or non-sexp form, like: *Fixes* + Timestamps with internal time ranges (e.g. ~<2024-06-26 10:00-11:00>~) are matched for simple queries. (This support is not yet comprehensive, e.g. a query that depends on the specific inner time range may not behave as expected. Previously such timestamps were not matched at all. See [[https://github.com/alphapapa/org-ql/pull/237][#237]] and [[https://github.com/alphapapa/org-ql/issues/371][#371]]. Thanks to [[https://github.com/yantar92][Ihor Radchenko]].) ++ Command ~org-ql-search~ did not narrow properly when called interactively. ** 0.8.6 diff --git a/org-ql-search.el b/org-ql-search.el index 57215f89..b8cd148e 100644 --- a/org-ql-search.el +++ b/org-ql-search.el @@ -184,7 +184,7 @@ necessary." (interactive (list (org-ql-view--complete-buffers-files) (read-string "Query: " (when org-ql-view-query (format "%S" org-ql-view-query))) - :narrow (or org-ql-view-narrow (eq current-prefix-arg '(4))) + :narrow (or org-ql-view-narrow (equal current-prefix-arg '(4))) :super-groups (org-ql-view--complete-super-groups) :sort (org-ql-view--complete-sort))) ;; NOTE: Using `with-temp-buffer' is a hack to work around the fact that `make-local-variable' diff --git a/org-ql.info b/org-ql.info index 711f1695..cce0f1ee 100644 --- a/org-ql.info +++ b/org-ql.info @@ -1089,6 +1089,8 @@ File: README.info, Node: 087-pre, Next: 086, Up: Changelog (https://github.com/alphapapa/org-ql/pull/237) and #371 (https://github.com/alphapapa/org-ql/issues/371). Thanks to Ihor Radchenko (https://github.com/yantar92).) + • Command ‘org-ql-search’ did not narrow properly when called + interactively.  File: README.info, Node: 086, Next: 085, Prev: 087-pre, Up: Changelog @@ -2018,47 +2020,47 @@ Node: Links38911 Node: Tips39598 Node: Changelog39922 Node: 087-pre40844 -Node: 08641453 -Node: 08541691 -Node: 08442347 -Node: 08342799 -Node: 08243140 -Node: 08143533 -Node: 0843954 -Node: 07446678 -Node: 07346901 -Node: 07247635 -Node: 07148556 -Node: 0749367 -Node: 06352233 -Node: 06252766 -Node: 06153073 -Node: 0653643 -Node: 05256699 -Node: 05157001 -Node: 0557426 -Node: 04958957 -Node: 04859239 -Node: 04759588 -Node: 04659997 -Node: 04560405 -Node: 04460766 -Node: 04361125 -Node: 04261328 -Node: 04161489 -Node: 0461736 -Node: 03265837 -Node: 03166240 -Node: 0366437 -Node: 02369737 -Node: 02269971 -Node: 02170251 -Node: 0270456 -Node: 0174534 -Node: Notes74635 -Node: Comparison with Org Agenda searches74797 -Node: org-sidebar75686 -Node: License75965 +Node: 08641544 +Node: 08541782 +Node: 08442438 +Node: 08342890 +Node: 08243231 +Node: 08143624 +Node: 0844045 +Node: 07446769 +Node: 07346992 +Node: 07247726 +Node: 07148647 +Node: 0749458 +Node: 06352324 +Node: 06252857 +Node: 06153164 +Node: 0653734 +Node: 05256790 +Node: 05157092 +Node: 0557517 +Node: 04959048 +Node: 04859330 +Node: 04759679 +Node: 04660088 +Node: 04560496 +Node: 04460857 +Node: 04361216 +Node: 04261419 +Node: 04161580 +Node: 0461827 +Node: 03265928 +Node: 03166331 +Node: 0366528 +Node: 02369828 +Node: 02270062 +Node: 02170342 +Node: 0270547 +Node: 0174625 +Node: Notes74726 +Node: Comparison with Org Agenda searches74888 +Node: org-sidebar75777 +Node: License76056  End Tag Table