From f22fdd457b129398a3b98cf21c621180bd3d977d Mon Sep 17 00:00:00 2001
From: Adam Porter <adam@alphapapa.net>
Date: Thu, 8 Dec 2022 19:48:40 -0600
Subject: [PATCH 1/5] Meta: v0.6.3-pre

---
 README.org  |   4 ++
 org-ql.el   |   2 +-
 org-ql.info | 183 ++++++++++++++++++++++++++++------------------------
 3 files changed, 102 insertions(+), 87 deletions(-)

diff --git a/README.org b/README.org
index a31d224..a72773e 100644
--- a/README.org
+++ b/README.org
@@ -522,6 +522,10 @@ Simple links may also be written manually in either sexp or non-sexp form, like:
 
 /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.6.3-pre
+
+Nothing yet.
+
 ** 0.6.2
 
 *Fixed*
diff --git a/org-ql.el b/org-ql.el
index 18ccf74..8f35ede 100644
--- a/org-ql.el
+++ b/org-ql.el
@@ -2,7 +2,7 @@
 
 ;; Author: Adam Porter <adam@alphapapa.net>
 ;; Url: https://github.com/alphapapa/org-ql
-;; Version: 0.6.2
+;; Version: 0.6.3-pre
 ;; Package-Requires: ((emacs "26.1") (dash "2.18.1") (f "0.17.2") (map "2.1") (org "9.0") (org-super-agenda "1.2") (ov "1.0.6") (peg "1.0") (s "1.12.0") (transient "0.1") (ts "0.2-pre"))
 ;; Keywords: hypermedia, outlines, Org, agenda
 
diff --git a/org-ql.info b/org-ql.info
index 6f2db2b..77ea789 100644
--- a/org-ql.info
+++ b/org-ql.info
@@ -69,6 +69,7 @@ Functions / Macros
 
 Changelog
 
+* 0.6.3-pre: 063-pre. 
 * 0.6.2: 062. 
 * 0.6.1: 061. 
 * 0.6: 06. 
@@ -950,6 +951,7 @@ releases.
 
 * Menu:
 
+* 0.6.3-pre: 063-pre. 
 * 0.6.2: 062. 
 * 0.6.1: 061. 
 * 0.6: 06. 
@@ -976,9 +978,17 @@ releases.
 * 0.1: 01. 
 
 
-File: README.info,  Node: 062,  Next: 061,  Up: Changelog
+File: README.info,  Node: 063-pre,  Next: 062,  Up: Changelog
 
-5.1 0.6.2
+5.1 0.6.3-pre
+=============
+
+Nothing yet.
+
+
+File: README.info,  Node: 062,  Next: 061,  Prev: 063-pre,  Up: Changelog
+
+5.2 0.6.2
 =========
 
 *Fixed*
@@ -989,7 +999,7 @@ File: README.info,  Node: 062,  Next: 061,  Up: Changelog
 
 File: README.info,  Node: 061,  Next: 06,  Prev: 062,  Up: Changelog
 
-5.2 0.6.1
+5.3 0.6.1
 =========
 
 *Fixed*
@@ -1007,7 +1017,7 @@ File: README.info,  Node: 061,  Next: 06,  Prev: 062,  Up: Changelog
 
 File: README.info,  Node: 06,  Next: 052,  Prev: 061,  Up: Changelog
 
-5.3 0.6
+5.4 0.6
 =======
 
 *Added*
@@ -1074,7 +1084,7 @@ File: README.info,  Node: 06,  Next: 052,  Prev: 061,  Up: Changelog
 
 File: README.info,  Node: 052,  Next: 051,  Prev: 06,  Up: Changelog
 
-5.4 0.5.2
+5.5 0.5.2
 =========
 
 *Fixed*
@@ -1085,7 +1095,7 @@ File: README.info,  Node: 052,  Next: 051,  Prev: 06,  Up: Changelog
 
 File: README.info,  Node: 051,  Next: 05,  Prev: 052,  Up: Changelog
 
-5.5 0.5.1
+5.6 0.5.1
 =========
 
 *Fixed*
@@ -1098,7 +1108,7 @@ File: README.info,  Node: 051,  Next: 05,  Prev: 052,  Up: Changelog
 
 File: README.info,  Node: 05,  Next: 049,  Prev: 051,  Up: Changelog
 
-5.6 0.5
+5.7 0.5
 =======
 
 *Added*
@@ -1139,7 +1149,7 @@ File: README.info,  Node: 05,  Next: 049,  Prev: 051,  Up: Changelog
 
 File: README.info,  Node: 049,  Next: 048,  Prev: 05,  Up: Changelog
 
-5.7 0.4.9
+5.8 0.4.9
 =========
 
 *Fixed*
@@ -1150,7 +1160,7 @@ File: README.info,  Node: 049,  Next: 048,  Prev: 05,  Up: Changelog
 
 File: README.info,  Node: 048,  Next: 047,  Prev: 049,  Up: Changelog
 
-5.8 0.4.8
+5.9 0.4.8
 =========
 
 *Fixed*
@@ -1162,8 +1172,8 @@ File: README.info,  Node: 048,  Next: 047,  Prev: 049,  Up: Changelog
 
 File: README.info,  Node: 047,  Next: 046,  Prev: 048,  Up: Changelog
 
-5.9 0.4.7
-=========
+5.10 0.4.7
+==========
 
 *Fixed*
    • Give a useful error if ‘org-ql-search-directories-files’ is called
@@ -1175,7 +1185,7 @@ File: README.info,  Node: 047,  Next: 046,  Prev: 048,  Up: Changelog
 
 File: README.info,  Node: 046,  Next: 045,  Prev: 047,  Up: Changelog
 
-5.10 0.4.6
+5.11 0.4.6
 ==========
 
 *Fixed*
@@ -1188,7 +1198,7 @@ File: README.info,  Node: 046,  Next: 045,  Prev: 047,  Up: Changelog
 
 File: README.info,  Node: 045,  Next: 044,  Prev: 046,  Up: Changelog
 
-5.11 0.4.5
+5.12 0.4.5
 ==========
 
 *Fixed*
@@ -1200,7 +1210,7 @@ File: README.info,  Node: 045,  Next: 044,  Prev: 046,  Up: Changelog
 
 File: README.info,  Node: 044,  Next: 043,  Prev: 045,  Up: Changelog
 
-5.12 0.4.4
+5.13 0.4.4
 ==========
 
 *Fixed*
@@ -1212,7 +1222,7 @@ File: README.info,  Node: 044,  Next: 043,  Prev: 045,  Up: Changelog
 
 File: README.info,  Node: 043,  Next: 042,  Prev: 044,  Up: Changelog
 
-5.13 0.4.3
+5.14 0.4.3
 ==========
 
 *Fixed*
@@ -1222,7 +1232,7 @@ File: README.info,  Node: 043,  Next: 042,  Prev: 044,  Up: Changelog
 
 File: README.info,  Node: 042,  Next: 041,  Prev: 043,  Up: Changelog
 
-5.14 0.4.2
+5.15 0.4.2
 ==========
 
 *Fixed*
@@ -1231,7 +1241,7 @@ File: README.info,  Node: 042,  Next: 041,  Prev: 043,  Up: Changelog
 
 File: README.info,  Node: 041,  Next: 04,  Prev: 042,  Up: Changelog
 
-5.15 0.4.1
+5.16 0.4.1
 ==========
 
 *Fixed*
@@ -1241,7 +1251,7 @@ File: README.info,  Node: 041,  Next: 04,  Prev: 042,  Up: Changelog
 
 File: README.info,  Node: 04,  Next: 032,  Prev: 041,  Up: Changelog
 
-5.16 0.4
+5.17 0.4
 ========
 
 _Note:_ The next release, 0.5, may include changes which will require
@@ -1322,7 +1332,7 @@ automatically, as they will be pushed to the ‘master’ branch when ready.
 
 File: README.info,  Node: 032,  Next: 031,  Prev: 04,  Up: Changelog
 
-5.17 0.3.2
+5.18 0.3.2
 ==========
 
 *Fixed*
@@ -1335,7 +1345,7 @@ File: README.info,  Node: 032,  Next: 031,  Prev: 04,  Up: Changelog
 
 File: README.info,  Node: 031,  Next: 03,  Prev: 032,  Up: Changelog
 
-5.18 0.3.1
+5.19 0.3.1
 ==========
 
 *Fixed*
@@ -1345,7 +1355,7 @@ File: README.info,  Node: 031,  Next: 03,  Prev: 032,  Up: Changelog
 
 File: README.info,  Node: 03,  Next: 023,  Prev: 031,  Up: Changelog
 
-5.19 0.3
+5.20 0.3
 ========
 
 *Added*
@@ -1413,7 +1423,7 @@ File: README.info,  Node: 03,  Next: 023,  Prev: 031,  Up: Changelog
 
 File: README.info,  Node: 023,  Next: 022,  Prev: 03,  Up: Changelog
 
-5.20 0.2.3
+5.21 0.2.3
 ==========
 
 *Fixed*
@@ -1423,7 +1433,7 @@ File: README.info,  Node: 023,  Next: 022,  Prev: 03,  Up: Changelog
 
 File: README.info,  Node: 022,  Next: 021,  Prev: 023,  Up: Changelog
 
-5.21 0.2.2
+5.22 0.2.2
 ==========
 
 *Fixed*
@@ -1434,7 +1444,7 @@ File: README.info,  Node: 022,  Next: 021,  Prev: 023,  Up: Changelog
 
 File: README.info,  Node: 021,  Next: 02,  Prev: 022,  Up: Changelog
 
-5.22 0.2.1
+5.23 0.2.1
 ==========
 
 *Fixed*
@@ -1444,7 +1454,7 @@ File: README.info,  Node: 021,  Next: 02,  Prev: 022,  Up: Changelog
 
 File: README.info,  Node: 02,  Next: 01,  Prev: 021,  Up: Changelog
 
-5.23 0.2
+5.24 0.2
 ========
 
 *Added*
@@ -1527,7 +1537,7 @@ File: README.info,  Node: 02,  Next: 01,  Prev: 021,  Up: Changelog
 
 File: README.info,  Node: 01,  Prev: 02,  Up: Changelog
 
-5.24 0.1
+5.25 0.1
 ========
 
 First tagged release.
@@ -1585,66 +1595,67 @@ GPLv3
 
 Tag Table:
 Node: Top225
-Node: Contents1728
-Node: Screenshots1851
-Node: Installation1969
-Node: Quelpa2483
-Node: Helm support3011
-Node: Usage3414
-Node: Commands3812
-Node: org-ql-search4285
-Node: helm-org-ql5959
-Node: org-ql-view6337
-Node: org-ql-view-sidebar6867
-Node: org-ql-view-recent-items7247
-Node: org-ql-sparse-tree7743
-Node: Queries8543
-Node: Non-sexp query syntax9660
-Node: General predicates11419
-Node: Ancestor/descendant predicates17658
-Node: Date/time predicates18786
-Node: Functions / Macros21910
-Node: Agenda-like views22208
-Ref: Function ‘org-ql-block’22370
-Node: Listing / acting-on results23631
-Ref: Caching23839
-Ref: Function ‘org-ql-select’24752
-Ref: Function ‘org-ql-query’27178
-Ref: Macro ‘org-ql’ (deprecated)28952
-Node: Custom predicates29267
-Ref: Macro ‘org-ql-defpred’29491
-Node: Dynamic block32932
-Node: Links35656
-Node: Tips36343
-Node: Changelog36667
-Node: 06237415
-Node: 06137708
-Node: 0638276
-Node: 05241330
-Node: 05141630
-Node: 0542053
-Node: 04943582
-Node: 04843862
-Node: 04744209
-Node: 04644616
-Node: 04545024
-Node: 04445385
-Node: 04345744
-Node: 04245947
-Node: 04146108
-Node: 0446355
-Node: 03250456
-Node: 03150859
-Node: 0351056
-Node: 02354356
-Node: 02254590
-Node: 02154870
-Node: 0255075
-Node: 0159153
-Node: Notes59254
-Node: Comparison with Org Agenda searches59416
-Node: org-sidebar60305
-Node: License60584
+Node: Contents1751
+Node: Screenshots1874
+Node: Installation1992
+Node: Quelpa2506
+Node: Helm support3034
+Node: Usage3437
+Node: Commands3835
+Node: org-ql-search4308
+Node: helm-org-ql5982
+Node: org-ql-view6360
+Node: org-ql-view-sidebar6890
+Node: org-ql-view-recent-items7270
+Node: org-ql-sparse-tree7766
+Node: Queries8566
+Node: Non-sexp query syntax9683
+Node: General predicates11442
+Node: Ancestor/descendant predicates17681
+Node: Date/time predicates18809
+Node: Functions / Macros21933
+Node: Agenda-like views22231
+Ref: Function ‘org-ql-block’22393
+Node: Listing / acting-on results23654
+Ref: Caching23862
+Ref: Function ‘org-ql-select’24775
+Ref: Function ‘org-ql-query’27201
+Ref: Macro ‘org-ql’ (deprecated)28975
+Node: Custom predicates29290
+Ref: Macro ‘org-ql-defpred’29514
+Node: Dynamic block32955
+Node: Links35679
+Node: Tips36366
+Node: Changelog36690
+Node: 063-pre37461
+Node: 06237569
+Node: 06137878
+Node: 0638446
+Node: 05241500
+Node: 05141800
+Node: 0542223
+Node: 04943752
+Node: 04844032
+Node: 04744379
+Node: 04644788
+Node: 04545196
+Node: 04445557
+Node: 04345916
+Node: 04246119
+Node: 04146280
+Node: 0446527
+Node: 03250628
+Node: 03151031
+Node: 0351228
+Node: 02354528
+Node: 02254762
+Node: 02155042
+Node: 0255247
+Node: 0159325
+Node: Notes59426
+Node: Comparison with Org Agenda searches59588
+Node: org-sidebar60477
+Node: License60756
 
 End Tag Table
 

From 85aee42fae23cc407f37dc1ab3b6459527c6b2be Mon Sep 17 00:00:00 2001
From: Adam Porter <adam@alphapapa.net>
Date: Thu, 8 Dec 2022 20:37:45 -0600
Subject: [PATCH 2/5] Meta: Update makem.sh to v0.6-pre

Needed for testing on Emacs 28+.
---
 makem.sh | 178 +++++++++++++++++++++++++++++++++++++++++++++----------
 1 file changed, 146 insertions(+), 32 deletions(-)

diff --git a/makem.sh b/makem.sh
index b9fc062..82a2db0 100755
--- a/makem.sh
+++ b/makem.sh
@@ -3,11 +3,11 @@
 # * makem.sh --- Script to aid building and testing Emacs Lisp packages
 
 # URL: https://github.com/alphapapa/makem.sh
-# Version: 0.3
+# Version: 0.6-pre
 
 # * Commentary:
 
-# makem.sh is a script helps to build, lint, and test Emacs Lisp
+# makem.sh is a script that helps to build, lint, and test Emacs Lisp
 # packages.  It aims to make linting and testing as simple as possible
 # without requiring per-package configuration.
 
@@ -79,7 +79,7 @@ Rules:
 Options:
   -d, --debug    Print debug info.
   -h, --help     I need somebody!
-  -v, --verbose  Increase verbosity, up to -vv.
+  -v, --verbose  Increase verbosity, up to -vvv.
   --no-color     Disable color output.
 
   --debug-load-path  Print load-path from inside Emacs.
@@ -136,6 +136,27 @@ EOF
     echo $file
 }
 
+function elisp-elint-file {
+    local file=$(mktemp)
+    cat >$file <<EOF
+(require 'cl-lib)
+(require 'elint)
+(defun makem-elint-file (file)
+  (let ((errors 0))
+    (cl-letf (((symbol-function 'orig-message) (symbol-function 'message))
+              ((symbol-function 'message) (symbol-function 'ignore))
+              ((symbol-function 'elint-output)
+               (lambda (string)
+                 (cl-incf errors)
+                 (orig-message "%s" string))))
+      (elint-file file)
+      ;; NOTE: \`errors' is not actually the number of errors, because
+      ;; it's incremented for non-error header strings as well.
+      (kill-emacs errors))))
+EOF
+    echo "$file"
+}
+
 function elisp-checkdoc-file {
     # Since checkdoc doesn't have a batch function that exits non-zero
     # when errors are found, we make one.
@@ -154,7 +175,8 @@ function elisp-checkdoc-file {
                                ": " text)))
               (message msg)
               (setq makem-checkdoc-errors-p t)
-              (list text start end unfixable)))))
+              ;; Return nil because we *are* generating a buffered list of errors.
+              nil))))
     (mapcar #'checkdoc-file files)
     (when makem-checkdoc-errors-p
       (kill-emacs 1))))
@@ -165,6 +187,51 @@ EOF
     echo $file
 }
 
+function elisp-byte-compile-file {
+    # This seems to be the only way to make byte-compilation signal
+    # errors for warnings AND display all warnings rather than only
+    # the first one.
+    local file=$(mktemp)
+    # TODO: Add file to $paths_temp in other elisp- functions.
+    paths_temp+=("$file")
+
+    cat >"$file" <<EOF
+(defun makem-batch-byte-compile (&rest args)
+  ""
+  (let ((num-errors 0)
+        (num-warnings 0))
+    ;; NOTE: Only accepts files as args, not directories.
+    (dolist (file command-line-args-left)
+      (pcase-let ((\`(,errors ,warnings) (makem-byte-compile-file file)))
+        (cl-incf num-errors errors)
+        (cl-incf num-warnings warnings)))
+    (zerop num-errors)))
+
+(defun makem-byte-compile-file (filename &optional load)
+  "Call \`byte-compile-warn', returning the number of errors and the number of warnings."
+  (let ((num-warnings 0)
+        (num-errors 0))
+    (cl-letf (((symbol-function 'byte-compile-warn)
+               (lambda (format &rest args)
+                 ;; Copied from \`byte-compile-warn'.
+                 (cl-incf num-warnings)
+                 (setq format (apply #'format-message format args))
+                 (byte-compile-log-warning format t :warning)))
+              ((symbol-function 'byte-compile-report-error)
+               (lambda (error-info &optional fill &rest args)
+                 (cl-incf num-errors)
+                 ;; Copied from \`byte-compile-report-error'.
+                 (setq byte-compiler-error-flag t)
+                 (byte-compile-log-warning
+                  (if (stringp error-info) error-info
+                    (error-message-string error-info))
+                  fill :error))))
+      (byte-compile-file filename load))
+    (list num-errors num-warnings)))
+EOF
+    echo "$file"
+}
+
 function elisp-check-declare-file {
     # Since check-declare doesn't have a batch function that exits
     # non-zero when errors are found, we make one.
@@ -200,20 +267,23 @@ Exits non-zero if mis-indented lines are found.  Checks files in
   (let ((errors-p))
     (cl-labels ((lint-file (file)
                            (find-file file)
-                           (let ((tick (buffer-modified-tick)))
-                             (let ((inhibit-message t))
-                               (indent-region (point-min) (point-max)))
-                             (when (/= tick (buffer-modified-tick))
-                               ;; Indentation changed: warn for each line.
-                               (dolist (line (undo-lines buffer-undo-list))
-                                 (message "%s:%s: Indentation mismatch" (buffer-name) line))
-                               (setf errors-p t))))
+                           (let ((inhibit-message t))
+                             (indent-region (point-min) (point-max)))
+                           (when buffer-undo-list
+                             ;; Indentation changed: warn for each line.
+                             (dolist (line (undo-lines buffer-undo-list))
+                               (message "%s:%s: Indentation mismatch" (buffer-name) line))
+                             (setf errors-p t)))
+                (undo-pos (entry)
+                           (cl-typecase (car entry)
+                             (number (car entry))
+                             (string (abs (cdr entry)))))
                 (undo-lines (undo-list)
                             ;; Return list of lines changed in UNDO-LIST.
                             (nreverse (cl-loop for elt in undo-list
-                                               when (and (consp elt)
-                                                         (numberp (car elt)))
-                                               collect (line-number-at-pos (car elt))))))
+                                               for pos = (undo-pos elt)
+                                               when pos
+                                               collect (line-number-at-pos pos)))))
       (mapc #'lint-file (mapcar #'expand-file-name command-line-args-left))
       (when errors-p
         (kill-emacs 1)))))
@@ -232,7 +302,6 @@ function elisp-package-initialize-file {
                              (cons "melpa-stable" "https://stable.melpa.org/packages/")))
 $elisp_org_package_archive
 (package-initialize)
-(setq load-prefer-newer t)
 EOF
     echo $file
 }
@@ -245,6 +314,7 @@ function run_emacs {
     local emacs_command=(
         "${emacs_command[@]}"
         -Q
+        --eval "(setq load-prefer-newer t)"
         "${args_debug[@]}"
         "${args_sandbox[@]}"
         -l $package_initialize_file
@@ -286,8 +356,9 @@ function batch-byte-compile {
     [[ $compile_error_on_warn ]] && local error_on_warn=(--eval "(setq byte-compile-error-on-warn t)")
 
     run_emacs \
+        --load "$(elisp-byte-compile-file)" \
         "${error_on_warn[@]}" \
-        --funcall batch-byte-compile \
+        --eval "(unless (makem-batch-byte-compile) (kill-emacs 1))" \
         "$@"
 }
 
@@ -297,10 +368,13 @@ function byte-compile-file {
 
     [[ $compile_error_on_warn ]] && local error_on_warn=(--eval "(setq byte-compile-error-on-warn t)")
 
+    # FIXME: Why is the line starting with "&& verbose 3" not indented properly?  Emacs insists on indenting it back a level.
     run_emacs \
+        --load "$(elisp-byte-compile-file)" \
         "${error_on_warn[@]}" \
-        --eval "(byte-compile-file \"$file\")" \
-        || error "Compiling file failed: $file"
+        --eval "(pcase-let ((\`(,num-errors ,num-warnings) (makem-byte-compile-file \"$file\"))) (when (or (and byte-compile-error-on-warn (not (zerop num-warnings))) (not (zerop num-errors))) (kill-emacs 1)))" \
+        && verbose 3 "Compiling $file finished without errors." \
+            || { verbose 3 "Compiling file failed: $file"; return 1; }
 }
 
 # ** Files
@@ -376,7 +450,8 @@ function args-load-files {
     # For file in $@, echo "--load $file".
     for file in "$@"
     do
-        printf -- '--load %q ' "$file"
+        sans_extension=${file%%.el}
+        printf -- '--load %q ' "$sans_extension"
     done
 }
 
@@ -413,8 +488,7 @@ function ert-tests-p {
 }
 
 function package-main-file {
-    # Echo the package's main file.  Helpful for setting package-lint-main-file.
-
+    # Echo the package's main file.
     file_pkg=$(git ls-files ./*-pkg.el 2>/dev/null)
 
     if [[ $file_pkg ]]
@@ -496,6 +570,8 @@ function sandbox {
     args_sandbox=(
         --title "makem.sh: $(basename $(pwd)) (sandbox: $sandbox_dir)"
         --eval "(setq user-emacs-directory (file-truename \"$sandbox_dir\"))"
+        --load package
+        --eval "(setq package-user-dir (expand-file-name \"elpa\" user-emacs-directory))"
         --eval "(setq user-init-file (file-truename \"$init_file\"))"
     )
 
@@ -658,7 +734,8 @@ function verbose {
     if [[ $verbose -ge $1 ]]
     then
         [[ $1 -eq 1 ]] && local color_name=blue
-        [[ $1 -ge 2 ]] && local color_name=cyan
+        [[ $1 -eq 2 ]] && local color_name=cyan
+        [[ $1 -ge 3 ]] && local color_name=white
 
         shift
         log_color $color_name "$@" >&2
@@ -706,9 +783,7 @@ function compile-batch {
     verbose 2 "Batch-compiling files..."
     debug "Byte-compile files: ${files_project_byte_compile[@]}"
 
-    batch-byte-compile "${files_project_byte_compile[@]}" \
-        && success "Compiling finished without errors." \
-            || error "Compilation failed."
+    batch-byte-compile "${files_project_byte_compile[@]}"
 }
 
 function compile-each {
@@ -726,9 +801,7 @@ function compile-each {
             || compile_errors=t
     done
 
-    ! [[ $compile_errors ]] \
-        && success "Compiling finished without errors." \
-            || error "Compilation failed."
+    [[ ! $compile_errors ]]
 }
 
 function compile {
@@ -738,6 +811,18 @@ function compile {
     else
         compile-each "$@"
     fi
+    local status=$?
+
+    if [[ $compile_error_on_warn ]]
+    then
+        # Linting: just return status code, because lint rule will print messages.
+        [[ $status = 0 ]]
+    else
+        # Not linting: print messages here.
+        [[ $status = 0 ]] \
+            && success "Compiling finished without errors." \
+                || error "Compiling failed."
+    fi
 }
 
 function batch {
@@ -752,12 +837,15 @@ function batch {
 
 function interactive {
     # Run Emacs interactively.  Most useful with --sandbox and --install-deps.
+    local load_file_args=$(args-load-files "${files_project_feature[@]}" "${files_project_test[@]}")
     verbose 1 "Running Emacs interactively..."
-    verbose 2 "Loading files:" "${files_project_feature[@]}" "${files_project_test[@]}"
+    verbose 2 "Loading files: ${load_file_args//--load /}"
+
+    [[ $compile ]] && compile
 
     unset arg_batch
     run_emacs \
-        $(args-load-files "${files_project_feature[@]}" "${files_project_test[@]}") \
+        $load_file_args \
         --eval "(load user-init-file)" \
         "${args_batch_interactive[@]}"
     arg_batch="--batch"
@@ -769,6 +857,9 @@ function lint {
     lint-checkdoc
     lint-compile
     lint-declare
+    # NOTE: Elint doesn't seem very useful at the moment.  See comment
+    # in lint-elint function.
+    # lint-elint
     lint-indent
     lint-package
     lint-regexps
@@ -825,6 +916,28 @@ function lint-elsa {
             || error "Linting with Elsa failed."
 }
 
+function lint-elint {
+    # NOTE: Elint gives a lot of spurious warnings, apparently because it doesn't load files
+    # that are `require'd, so its output isn't very useful.  But in case it's improved in
+    # the future, and since this wrapper code already works, we might as well leave it in.
+    verbose 1 "Linting with Elint..."
+
+    local errors=0
+    for file in "${files_project_feature[@]}"
+    do
+        verbose 2 "Linting with Elint: $file..."
+        run_emacs \
+            --load "$(elisp-elint-file)" \
+            --eval "(makem-elint-file \"$file\")" \
+            && verbose 3 "Linting with Elint found no errors." \
+                || { error "Linting with Elint failed: $file"; ((errors++)) ; }
+    done
+
+    [[ $errors = 0 ]] \
+        && success "Linting with Elint finished without errors." \
+            || error "Linting with Elint failed."
+}
+
 function lint-indent {
     verbose 1 "Linting indentation..."
 
@@ -896,7 +1009,8 @@ function test-buttercup {
 
     run_emacs \
         $(args-load-files "${files_project_test[@]}") \
-        -f buttercup-run \
+        --load "$buttercup_file" \
+        --eval "(progn (setq backtrace-on-error-noninteractive nil) (buttercup-run))" \
         && success "Buttercup tests finished without errors." \
             || error "Buttercup tests failed."
 }

From 9f00fa38907c31ce36b6e8e83383a7129f85f79f Mon Sep 17 00:00:00 2001
From: Adam Porter <adam@alphapapa.net>
Date: Thu, 8 Dec 2022 19:50:37 -0600
Subject: [PATCH 3/5] Fix: (org-ql--def-query-string-to-sexp-fn) Updated for
 peg v1.0.1

Fixes #314, fixes #316.  Thanks to Akira Komamura (@akirak) and Joon
Ro (@joonro) for reporting.

Instead of `[blank]` in this PEX, it used to be `(syntax-class
whitespace)`, which worked fine with peg v1.0.  Then
<https://debbugs.gnu.org/cgi/bugreport.cgi?bug=59345> was filed and
resulted in the release of peg v1.0.1, after which that no longer
worked.  As best I can tell from reading the discussion, `[blank]` and
`(syntax-class whitespace)` should behave the same way, yet here they
do not: with peg v1.0.1, only `[blank]` works.  Why, I do not know; I
only tried it because I could find no explanation for the broken
behavior, and luckily, it works.  Maybe it's due to the use of
`(syntax-class whitespace)` later in the `pexs`; but since it finally
works again, let's take the victory as-is.
---
 README.org  |  3 ++-
 org-ql.el   |  5 ++---
 org-ql.info | 64 +++++++++++++++++++++++++++++------------------------
 3 files changed, 39 insertions(+), 33 deletions(-)

diff --git a/README.org b/README.org
index a72773e..caf9b67 100644
--- a/README.org
+++ b/README.org
@@ -524,7 +524,8 @@ Simple links may also be written manually in either sexp or non-sexp form, like:
 
 ** 0.6.3-pre
 
-Nothing yet.
+*Fixed*
++ Non-sexp query parsing with updated version 1.0.1 of the ~peg~ package.  (Fixes [[https://github.com/alphapapa/org-ql/issues/314][#314]], [[https://github.com/alphapapa/org-ql/issues/316][#316]].  Thanks to [[https://github.com/akirak][Akira Komamura]] and [[https://github.com/joonro][Joon Ro]] for reporting.)
 
 ** 0.6.2
 
diff --git a/org-ql.el b/org-ql.el
index 8f35ede..07bc664 100644
--- a/org-ql.el
+++ b/org-ql.el
@@ -3,7 +3,7 @@
 ;; Author: Adam Porter <adam@alphapapa.net>
 ;; Url: https://github.com/alphapapa/org-ql
 ;; Version: 0.6.3-pre
-;; Package-Requires: ((emacs "26.1") (dash "2.18.1") (f "0.17.2") (map "2.1") (org "9.0") (org-super-agenda "1.2") (ov "1.0.6") (peg "1.0") (s "1.12.0") (transient "0.1") (ts "0.2-pre"))
+;; Package-Requires: ((emacs "26.1") (dash "2.18.1") (f "0.17.2") (map "2.1") (org "9.0") (org-super-agenda "1.2") (ov "1.0.6") (peg "1.0.1") (s "1.12.0") (transient "0.1") (ts "0.2-pre"))
 ;; Keywords: hypermedia, outlines, Org, agenda
 
 ;;; Commentary:
@@ -854,8 +854,7 @@ value of `org-ql-predicates')."
                             ;; obscure bug in `peg': when one keyword is a substring of another,
                             ;; and the shorter one is listed first, the shorter one fails to match.
                             (-sort (-on #'> #'length))))
-         (pexs `((query (+ term
-                           (opt (+ (syntax-class whitespace) (any)))))
+         (pexs `((query (+ (and term (* [blank]))))
                  (term (or (and negation (list positive-term)
                                 ;; This is a bit confusing, but it seems to work.  There's probably a better way.
                                 `(pred -- (list 'not (car pred))))
diff --git a/org-ql.info b/org-ql.info
index 77ea789..4f99a54 100644
--- a/org-ql.info
+++ b/org-ql.info
@@ -983,7 +983,13 @@ File: README.info,  Node: 063-pre,  Next: 062,  Up: Changelog
 5.1 0.6.3-pre
 =============
 
-Nothing yet.
+*Fixed*
+   • Non-sexp query parsing with updated version 1.0.1 of the ‘peg’
+     package.  (Fixes #314
+     (https://github.com/alphapapa/org-ql/issues/314), #316
+     (https://github.com/alphapapa/org-ql/issues/316).  Thanks to Akira
+     Komamura (https://github.com/akirak) and Joon Ro
+     (https://github.com/joonro) for reporting.)
 
 
 File: README.info,  Node: 062,  Next: 061,  Prev: 063-pre,  Up: Changelog
@@ -1628,34 +1634,34 @@ Node: Links35679
 Node: Tips36366
 Node: Changelog36690
 Node: 063-pre37461
-Node: 06237569
-Node: 06137878
-Node: 0638446
-Node: 05241500
-Node: 05141800
-Node: 0542223
-Node: 04943752
-Node: 04844032
-Node: 04744379
-Node: 04644788
-Node: 04545196
-Node: 04445557
-Node: 04345916
-Node: 04246119
-Node: 04146280
-Node: 0446527
-Node: 03250628
-Node: 03151031
-Node: 0351228
-Node: 02354528
-Node: 02254762
-Node: 02155042
-Node: 0255247
-Node: 0159325
-Node: Notes59426
-Node: Comparison with Org Agenda searches59588
-Node: org-sidebar60477
-Node: License60756
+Node: 06237900
+Node: 06138209
+Node: 0638777
+Node: 05241831
+Node: 05142131
+Node: 0542554
+Node: 04944083
+Node: 04844363
+Node: 04744710
+Node: 04645119
+Node: 04545527
+Node: 04445888
+Node: 04346247
+Node: 04246450
+Node: 04146611
+Node: 0446858
+Node: 03250959
+Node: 03151362
+Node: 0351559
+Node: 02354859
+Node: 02255093
+Node: 02155373
+Node: 0255578
+Node: 0159656
+Node: Notes59757
+Node: Comparison with Org Agenda searches59919
+Node: org-sidebar60808
+Node: License61087
 
 End Tag Table
 

From 2ddfb7c231d42211ecace54320f454c4a8ace4de Mon Sep 17 00:00:00 2001
From: Adam Porter <adam@alphapapa.net>
Date: Thu, 8 Dec 2022 20:41:50 -0600
Subject: [PATCH 4/5] Fix: Require org-duration

This appears to be necessary on newer Org versions, but I don't know
exactly when.
---
 README.org  |  1 +
 org-ql.el   |  1 +
 org-ql.info | 58 +++++++++++++++++++++++++++--------------------------
 3 files changed, 32 insertions(+), 28 deletions(-)

diff --git a/README.org b/README.org
index caf9b67..bb1c549 100644
--- a/README.org
+++ b/README.org
@@ -526,6 +526,7 @@ Simple links may also be written manually in either sexp or non-sexp form, like:
 
 *Fixed*
 + Non-sexp query parsing with updated version 1.0.1 of the ~peg~ package.  (Fixes [[https://github.com/alphapapa/org-ql/issues/314][#314]], [[https://github.com/alphapapa/org-ql/issues/316][#316]].  Thanks to [[https://github.com/akirak][Akira Komamura]] and [[https://github.com/joonro][Joon Ro]] for reporting.)
++ Require library ~org-duration~ (apparently necessary in newer Org versions).
 
 ** 0.6.2
 
diff --git a/org-ql.el b/org-ql.el
index 07bc664..e44a4aa 100644
--- a/org-ql.el
+++ b/org-ql.el
@@ -35,6 +35,7 @@
 
 (require 'cl-lib)
 (require 'org)
+(require 'org-duration)
 (require 'org-element)
 (require 'org-habit)
 (require 'seq)
diff --git a/org-ql.info b/org-ql.info
index 4f99a54..933c981 100644
--- a/org-ql.info
+++ b/org-ql.info
@@ -990,6 +990,8 @@ File: README.info,  Node: 063-pre,  Next: 062,  Up: Changelog
      (https://github.com/alphapapa/org-ql/issues/316).  Thanks to Akira
      Komamura (https://github.com/akirak) and Joon Ro
      (https://github.com/joonro) for reporting.)
+   • Require library ‘org-duration’ (apparently necessary in newer Org
+     versions).
 
 
 File: README.info,  Node: 062,  Next: 061,  Prev: 063-pre,  Up: Changelog
@@ -1634,34 +1636,34 @@ Node: Links35679
 Node: Tips36366
 Node: Changelog36690
 Node: 063-pre37461
-Node: 06237900
-Node: 06138209
-Node: 0638777
-Node: 05241831
-Node: 05142131
-Node: 0542554
-Node: 04944083
-Node: 04844363
-Node: 04744710
-Node: 04645119
-Node: 04545527
-Node: 04445888
-Node: 04346247
-Node: 04246450
-Node: 04146611
-Node: 0446858
-Node: 03250959
-Node: 03151362
-Node: 0351559
-Node: 02354859
-Node: 02255093
-Node: 02155373
-Node: 0255578
-Node: 0159656
-Node: Notes59757
-Node: Comparison with Org Agenda searches59919
-Node: org-sidebar60808
-Node: License61087
+Node: 06237993
+Node: 06138302
+Node: 0638870
+Node: 05241924
+Node: 05142224
+Node: 0542647
+Node: 04944176
+Node: 04844456
+Node: 04744803
+Node: 04645212
+Node: 04545620
+Node: 04445981
+Node: 04346340
+Node: 04246543
+Node: 04146704
+Node: 0446951
+Node: 03251052
+Node: 03151455
+Node: 0351652
+Node: 02354952
+Node: 02255186
+Node: 02155466
+Node: 0255671
+Node: 0159749
+Node: Notes59850
+Node: Comparison with Org Agenda searches60012
+Node: org-sidebar60901
+Node: License61180
 
 End Tag Table
 

From 80b334c269b121c21b9a5a5a4b84f0f38bf9269e Mon Sep 17 00:00:00 2001
From: Adam Porter <adam@alphapapa.net>
Date: Thu, 8 Dec 2022 19:51:09 -0600
Subject: [PATCH 5/5] Release: v0.6.3

---
 README.org  |   2 +-
 org-ql.el   |   2 +-
 org-ql.info | 134 ++++++++++++++++++++++++++--------------------------
 3 files changed, 69 insertions(+), 69 deletions(-)

diff --git a/README.org b/README.org
index bb1c549..23da3a9 100644
--- a/README.org
+++ b/README.org
@@ -522,7 +522,7 @@ Simple links may also be written manually in either sexp or non-sexp form, like:
 
 /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.6.3-pre
+** 0.6.3
 
 *Fixed*
 + Non-sexp query parsing with updated version 1.0.1 of the ~peg~ package.  (Fixes [[https://github.com/alphapapa/org-ql/issues/314][#314]], [[https://github.com/alphapapa/org-ql/issues/316][#316]].  Thanks to [[https://github.com/akirak][Akira Komamura]] and [[https://github.com/joonro][Joon Ro]] for reporting.)
diff --git a/org-ql.el b/org-ql.el
index e44a4aa..c5a1275 100644
--- a/org-ql.el
+++ b/org-ql.el
@@ -2,7 +2,7 @@
 
 ;; Author: Adam Porter <adam@alphapapa.net>
 ;; Url: https://github.com/alphapapa/org-ql
-;; Version: 0.6.3-pre
+;; Version: 0.6.3
 ;; Package-Requires: ((emacs "26.1") (dash "2.18.1") (f "0.17.2") (map "2.1") (org "9.0") (org-super-agenda "1.2") (ov "1.0.6") (peg "1.0.1") (s "1.12.0") (transient "0.1") (ts "0.2-pre"))
 ;; Keywords: hypermedia, outlines, Org, agenda
 
diff --git a/org-ql.info b/org-ql.info
index 933c981..32be3ab 100644
--- a/org-ql.info
+++ b/org-ql.info
@@ -69,7 +69,7 @@ Functions / Macros
 
 Changelog
 
-* 0.6.3-pre: 063-pre. 
+* 0.6.3: 063. 
 * 0.6.2: 062. 
 * 0.6.1: 061. 
 * 0.6: 06. 
@@ -951,7 +951,7 @@ releases.
 
 * Menu:
 
-* 0.6.3-pre: 063-pre. 
+* 0.6.3: 063. 
 * 0.6.2: 062. 
 * 0.6.1: 061. 
 * 0.6: 06. 
@@ -978,10 +978,10 @@ releases.
 * 0.1: 01. 
 
 
-File: README.info,  Node: 063-pre,  Next: 062,  Up: Changelog
+File: README.info,  Node: 063,  Next: 062,  Up: Changelog
 
-5.1 0.6.3-pre
-=============
+5.1 0.6.3
+=========
 
 *Fixed*
    • Non-sexp query parsing with updated version 1.0.1 of the ‘peg’
@@ -994,7 +994,7 @@ File: README.info,  Node: 063-pre,  Next: 062,  Up: Changelog
      versions).
 
 
-File: README.info,  Node: 062,  Next: 061,  Prev: 063-pre,  Up: Changelog
+File: README.info,  Node: 062,  Next: 061,  Prev: 063,  Up: Changelog
 
 5.2 0.6.2
 =========
@@ -1603,67 +1603,67 @@ GPLv3
 
 Tag Table:
 Node: Top225
-Node: Contents1751
-Node: Screenshots1874
-Node: Installation1992
-Node: Quelpa2506
-Node: Helm support3034
-Node: Usage3437
-Node: Commands3835
-Node: org-ql-search4308
-Node: helm-org-ql5982
-Node: org-ql-view6360
-Node: org-ql-view-sidebar6890
-Node: org-ql-view-recent-items7270
-Node: org-ql-sparse-tree7766
-Node: Queries8566
-Node: Non-sexp query syntax9683
-Node: General predicates11442
-Node: Ancestor/descendant predicates17681
-Node: Date/time predicates18809
-Node: Functions / Macros21933
-Node: Agenda-like views22231
-Ref: Function ‘org-ql-block’22393
-Node: Listing / acting-on results23654
-Ref: Caching23862
-Ref: Function ‘org-ql-select’24775
-Ref: Function ‘org-ql-query’27201
-Ref: Macro ‘org-ql’ (deprecated)28975
-Node: Custom predicates29290
-Ref: Macro ‘org-ql-defpred’29514
-Node: Dynamic block32955
-Node: Links35679
-Node: Tips36366
-Node: Changelog36690
-Node: 063-pre37461
-Node: 06237993
-Node: 06138302
-Node: 0638870
-Node: 05241924
-Node: 05142224
-Node: 0542647
-Node: 04944176
-Node: 04844456
-Node: 04744803
-Node: 04645212
-Node: 04545620
-Node: 04445981
-Node: 04346340
-Node: 04246543
-Node: 04146704
-Node: 0446951
-Node: 03251052
-Node: 03151455
-Node: 0351652
-Node: 02354952
-Node: 02255186
-Node: 02155466
-Node: 0255671
-Node: 0159749
-Node: Notes59850
-Node: Comparison with Org Agenda searches60012
-Node: org-sidebar60901
-Node: License61180
+Node: Contents1743
+Node: Screenshots1866
+Node: Installation1984
+Node: Quelpa2498
+Node: Helm support3026
+Node: Usage3429
+Node: Commands3827
+Node: org-ql-search4300
+Node: helm-org-ql5974
+Node: org-ql-view6352
+Node: org-ql-view-sidebar6882
+Node: org-ql-view-recent-items7262
+Node: org-ql-sparse-tree7758
+Node: Queries8558
+Node: Non-sexp query syntax9675
+Node: General predicates11434
+Node: Ancestor/descendant predicates17673
+Node: Date/time predicates18801
+Node: Functions / Macros21925
+Node: Agenda-like views22223
+Ref: Function ‘org-ql-block’22385
+Node: Listing / acting-on results23646
+Ref: Caching23854
+Ref: Function ‘org-ql-select’24767
+Ref: Function ‘org-ql-query’27193
+Ref: Macro ‘org-ql’ (deprecated)28967
+Node: Custom predicates29282
+Ref: Macro ‘org-ql-defpred’29506
+Node: Dynamic block32947
+Node: Links35671
+Node: Tips36358
+Node: Changelog36682
+Node: 06337445
+Node: 06237965
+Node: 06138270
+Node: 0638838
+Node: 05241892
+Node: 05142192
+Node: 0542615
+Node: 04944144
+Node: 04844424
+Node: 04744771
+Node: 04645180
+Node: 04545588
+Node: 04445949
+Node: 04346308
+Node: 04246511
+Node: 04146672
+Node: 0446919
+Node: 03251020
+Node: 03151423
+Node: 0351620
+Node: 02354920
+Node: 02255154
+Node: 02155434
+Node: 0255639
+Node: 0159717
+Node: Notes59818
+Node: Comparison with Org Agenda searches59980
+Node: org-sidebar60869
+Node: License61148
 
 End Tag Table