Merge: 0.4.5

Author: alphapapa

README.org

@@ -412,6 +412,11 @@ Expands into a call to ~org-ql-select~ with the same arguments.  For convenience
 *Changed*
 +  Binding to refresh search/view buffers changed to =r=.
 
+** 0.4.5
+
+*Fixed*
++  Non-case-folding predicates like ~(todo)~ unnecessarily disabled case-folding for other predicates.  ([[https://github.com/alphapapa/org-ql/issues/114][Issue #114]].  Thanks to [[https://github.com/bitclick][@bitclick]] for reporting.)
+
 ** 0.4.4
 
 *Fixed*

org-ql.el

@@ -377,12 +377,12 @@ If NARROW is non-nil, buffer will not be widened."
                       (message "org-ql: No headings in buffer: %s" (current-buffer)))
                     nil)
                 ;; Find matching entries.
-                (cond (preamble (let ((case-fold-search preamble-case-fold))
-                                  (cl-loop while (re-search-forward preamble nil t)
-                                           do (outline-back-to-heading 'invisible-ok)
-                                           when (funcall predicate)
-                                           collect (funcall action)
-                                           do (outline-next-heading))))
+                (cond (preamble (cl-loop while (let ((case-fold-search preamble-case-fold))
+                                                 (re-search-forward preamble nil t))
+                                         do (outline-back-to-heading 'invisible-ok)
+                                         when (funcall predicate)
+                                         collect (funcall action)
+                                         do (outline-next-heading)))
                       (t (cl-loop when (funcall predicate)
                                   collect (funcall action)
                                   while (outline-next-heading))))))))

org-ql.info

@@ -64,6 +64,7 @@ Functions / Macros
 Changelog
 
 * 0.5-pre: 05-pre. 
+* 0.4.5: 045. 
 * 0.4.4: 044. 
 * 0.4.3: 043. 
 * 0.4.2: 042. 
@@ -721,6 +722,7 @@ releases.
 * Menu:
 
 * 0.5-pre: 05-pre. 
+* 0.4.5: 045. 
 * 0.4.4: 044. 
 * 0.4.3: 043. 
 * 0.4.2: 042. 
@@ -736,7 +738,7 @@ releases.
 * 0.1: 01. 
 
 
-File: README.info,  Node: 05-pre,  Next: 044,  Up: Changelog
+File: README.info,  Node: 05-pre,  Next: 045,  Up: Changelog
 
 5.1 0.5-pre
 ===========
@@ -752,9 +754,21 @@ File: README.info,  Node: 05-pre,  Next: 044,  Up: Changelog
    • Binding to refresh search/view buffers changed to r.
 
 
-File: README.info,  Node: 044,  Next: 043,  Prev: 05-pre,  Up: Changelog
+File: README.info,  Node: 045,  Next: 044,  Prev: 05-pre,  Up: Changelog
 
-5.2 0.4.4
+5.2 0.4.5
+=========
+
+*Fixed*
+   • Non-case-folding predicates like ‘(todo)’ unnecessarily disabled
+     case-folding for other predicates.  (Issue #114
+     (https://github.com/alphapapa/org-ql/issues/114).  Thanks to
+     @bitclick (https://github.com/bitclick) for reporting.)
+
+
+File: README.info,  Node: 044,  Next: 043,  Prev: 045,  Up: Changelog
+
+5.3 0.4.4
 =========
 
 *Fixed*
@@ -766,7 +780,7 @@ File: README.info,  Node: 044,  Next: 043,  Prev: 05-pre,  Up: Changelog
 
 File: README.info,  Node: 043,  Next: 042,  Prev: 044,  Up: Changelog
 
-5.3 0.4.3
+5.4 0.4.3
 =========
 
 *Fixed*
@@ -776,7 +790,7 @@ File: README.info,  Node: 043,  Next: 042,  Prev: 044,  Up: Changelog
 
 File: README.info,  Node: 042,  Next: 041,  Prev: 043,  Up: Changelog
 
-5.4 0.4.2
+5.5 0.4.2
 =========
 
 *Fixed*
@@ -785,7 +799,7 @@ File: README.info,  Node: 042,  Next: 041,  Prev: 043,  Up: Changelog
 
 File: README.info,  Node: 041,  Next: 04,  Prev: 042,  Up: Changelog
 
-5.5 0.4.1
+5.6 0.4.1
 =========
 
 *Fixed*
@@ -795,7 +809,7 @@ File: README.info,  Node: 041,  Next: 04,  Prev: 042,  Up: Changelog
 
 File: README.info,  Node: 04,  Next: 032,  Prev: 041,  Up: Changelog
 
-5.6 0.4
+5.7 0.4
 =======
 
 _Note:_ The next release, 0.5, may include changes which will require
@@ -876,7 +890,7 @@ as they will be pushed to the master branch when ready.
 
 File: README.info,  Node: 032,  Next: 031,  Prev: 04,  Up: Changelog
 
-5.7 0.3.2
+5.8 0.3.2
 =========
 
 *Fixed*
@@ -889,7 +903,7 @@ File: README.info,  Node: 032,  Next: 031,  Prev: 04,  Up: Changelog
 
 File: README.info,  Node: 031,  Next: 03,  Prev: 032,  Up: Changelog
 
-5.8 0.3.1
+5.9 0.3.1
 =========
 
 *Fixed*
@@ -899,8 +913,8 @@ File: README.info,  Node: 031,  Next: 03,  Prev: 032,  Up: Changelog
 
 File: README.info,  Node: 03,  Next: 023,  Prev: 031,  Up: Changelog
 
-5.9 0.3
-=======
+5.10 0.3
+========
 
 *Added*
    • Alternative, non-sexp query syntax for commands org-ql-search and
@@ -964,7 +978,7 @@ File: README.info,  Node: 03,  Next: 023,  Prev: 031,  Up: Changelog
 
 File: README.info,  Node: 023,  Next: 022,  Prev: 03,  Up: Changelog
 
-5.10 0.2.3
+5.11 0.2.3
 ==========
 
 *Fixed*
@@ -974,7 +988,7 @@ File: README.info,  Node: 023,  Next: 022,  Prev: 03,  Up: Changelog
 
 File: README.info,  Node: 022,  Next: 021,  Prev: 023,  Up: Changelog
 
-5.11 0.2.2
+5.12 0.2.2
 ==========
 
 *Fixed*
@@ -985,7 +999,7 @@ File: README.info,  Node: 022,  Next: 021,  Prev: 023,  Up: Changelog
 
 File: README.info,  Node: 021,  Next: 02,  Prev: 022,  Up: Changelog
 
-5.12 0.2.1
+5.13 0.2.1
 ==========
 
 *Fixed*
@@ -995,7 +1009,7 @@ File: README.info,  Node: 021,  Next: 02,  Prev: 022,  Up: Changelog
 
 File: README.info,  Node: 02,  Next: 01,  Prev: 021,  Up: Changelog
 
-5.13 0.2
+5.14 0.2
 ========
 
 *Added*
@@ -1078,7 +1092,7 @@ File: README.info,  Node: 02,  Next: 01,  Prev: 021,  Up: Changelog
 
 File: README.info,  Node: 01,  Prev: 02,  Up: Changelog
 
-5.14 0.1
+5.15 0.1
 ========
 
 First tagged release.
@@ -1136,45 +1150,46 @@ GPLv3
 
 Tag Table:
 Node: Top225
-Node: Contents1482
-Node: Screenshots1605
-Node: Installation1723
-Node: Quelpa2361
-Node: Usage2804
-Node: Commands3153
-Node: org-ql-search3626
-Node: helm-org-ql5340
-Node: org-ql-view5752
-Node: org-ql-view-sidebar6252
-Node: org-ql-view-recent-items6608
-Node: org-ql-sparse-tree7092
-Node: Queries7892
-Node: Non-sexp query syntax8800
-Node: General predicates10507
-Node: Ancestor/descendant predicates15722
-Node: Date/time predicates16850
-Node: Functions / Macros19505
-Node: Agenda-like views19738
-Node: Listing / acting-on results21143
-Node: Changelog25745
-Node: 05-pre26354
-Node: 04426718
-Node: 04327078
-Node: 04227273
-Node: 04127432
-Node: 0427671
-Node: 03231602
-Node: 03131979
-Node: 0332174
-Node: 02335147
-Node: 02235375
-Node: 02135643
-Node: 0235842
-Node: 0139877
-Node: Notes39978
-Node: Comparison with Org Agenda searches40140
-Node: org-sidebar41012
-Node: License41291
+Node: Contents1497
+Node: Screenshots1620
+Node: Installation1738
+Node: Quelpa2376
+Node: Usage2819
+Node: Commands3168
+Node: org-ql-search3641
+Node: helm-org-ql5355
+Node: org-ql-view5767
+Node: org-ql-view-sidebar6267
+Node: org-ql-view-recent-items6623
+Node: org-ql-sparse-tree7107
+Node: Queries7907
+Node: Non-sexp query syntax8815
+Node: General predicates10522
+Node: Ancestor/descendant predicates15737
+Node: Date/time predicates16865
+Node: Functions / Macros19520
+Node: Agenda-like views19753
+Node: Listing / acting-on results21158
+Node: Changelog25760
+Node: 05-pre26384
+Node: 04526748
+Node: 04427110
+Node: 04327467
+Node: 04227662
+Node: 04127821
+Node: 0428060
+Node: 03231991
+Node: 03132368
+Node: 0332563
+Node: 02335538
+Node: 02235766
+Node: 02136034
+Node: 0236233
+Node: 0140268
+Node: Notes40369
+Node: Comparison with Org Agenda searches40531
+Node: org-sidebar41403
+Node: License41682
 
 End Tag Table
 

tests/test-org-ql.el

@@ -741,6 +741,13 @@ RESULTS should be a list of strings as returned by
       (org-ql-it "with two plain strings in an OR"
         (org-ql-expect ((or "Take over" "universe")
                         :sort todo)
+          '("Take over the universe" "Take over the world" "Take over Mars" "Take over the moon" "Get haircut")))
+
+      (org-ql-it "case-folding predicate with non-case-folding preamble"
+        ;; e.g. the (todo) predicate disables case-folding in its preamble, but that
+        ;; should not prevent case-folding in this and other predicates (issue #114).
+        (org-ql-expect ((and (todo "TODO") (regexp "take over"))
+                        :sort todo)
           '("Take over the universe" "Take over the world" "Take over Mars" "Take over the moon" "Get haircut"))))
 
     (describe "(scheduled)"