Apply #459

Docs: Remove grammatical typo from “org-ql-search-block”

README.org

@@ -19,6 +19,7 @@ It includes three libraries: The =org-ql= library is flexible and may be used as
 - [[#installation][Installation]]
 - [[#usage][Usage]]
 - [[#changelog][Changelog]]
+- [[#development][Development]]
 :END:
 
 
@@ -232,7 +233,7 @@ Note that the =effort=, =level=, and =priority= predicates do not support compar
 Arguments are listed next to predicate names, where applicable.
 
 +  =blocked= :: Return non-nil if current heading is blocked.  Calls ~org-entry-blocked-p~, which see.
-+  =category (&optional categories)= :: Return non-nil if current heading is in one or more of ~CATEGORIES~ (a list of strings).
++  =category (&rest categories)= :: Return non-nil if current heading is in one or more of ~CATEGORIES~ (a list of strings).
 +  =done= :: Return non-nil if entry's ~TODO~ keyword is in ~org-done-keywords~.
 +  =effort (&optional effort-or-comparator effort)= :: Return non-nil if current heading's effort property matches arguments.  The following forms are accepted: ~(effort DURATION)~: Matches if effort is ~DURATION~.  ~(effort DURATION DURATION)~: Matches if effort is between DURATIONs, inclusive.  ~(effort COMPARATOR DURATION)~: Matches if effort compares to ~DURATION~ with ~COMPARATOR~.  ~COMPARATOR~ may be ~<~, ~<=~, ~>~, or ~>=~.  ~DURATION~ should be an Org effort string, like =5= or =0:05=.
 +  =habit= :: Return non-nil if entry is a habit.
@@ -255,16 +256,16 @@ Arguments are listed next to predicate names, where applicable.
      - Aliases: ~smart~.
      - *Note:* By default, this is the default predicate used for plain-string query tokens (i.e. given without a specified predicate).  This can be customized with the option ~org-ql-default-predicate~.
 +  ~src (&key lang regexps)~ :: Return non-nil if current entry contains an Org Babel source block.  If ~LANG~ is non-nil, match blocks of that language.  If ~REGEXPS~ is non-nil, require that block's contents match all regexps.  Matching is done case-insensitively.
-+  =tags (&optional tags)= :: Return non-nil if current heading has one or more of ~TAGS~ (a list of strings).  Tests both inherited and local tags.
++  =tags (&rest tags)= :: Return non-nil if current heading has one or more of ~TAGS~ (a list of strings).  Tests both inherited and local tags.
-+  =tags-inherited (&optional tags)= :: Return non-nil if current heading's inherited tags include one or more of ~TAGS~ (a list of strings).  If ~TAGS~ is nil, return non-nil if heading has any inherited tags.
++  =tags-inherited (&rest tags)= :: Return non-nil if current heading's inherited tags include one or more of ~TAGS~ (a list of strings).  If ~TAGS~ is nil, return non-nil if heading has any inherited tags.
      -  Aliases: ~inherited-tags~, ~tags-i~, ~itags~.
-+  =tags-local (&optional tags)= :: Return non-nil if current heading's local tags include one or more of ~TAGS~ (a list of strings).  If ~TAGS~ is nil, return non-nil if heading has any local tags.
++  =tags-local (&rest tags)= :: Return non-nil if current heading's local tags include one or more of ~TAGS~ (a list of strings).  If ~TAGS~ is nil, return non-nil if heading has any local tags.
      -  Aliases: ~local-tags~, ~tags-l~, ~ltags~.
-+  =tags-all (tags)= :: Return non-nil if current heading includes all of ~TAGS~.  Tests both inherited and local tags.
++  =tags-all (&rest tags)= :: Return non-nil if current heading includes all of ~TAGS~.  Tests both inherited and local tags.
      -  Aliases: ~tags&~.
 +  =tags-regexp (&rest regexps)= :: Return non-nil if current heading has tags matching one or more of ~REGEXPS~.  Tests both inherited and local tags.
      -  Aliases: ~tags*~.
-+  =todo (&optional keywords)= :: Return non-nil if current heading is a ~TODO~ item.  With ~KEYWORDS~, return non-nil if its keyword is one of ~KEYWORDS~ (a list of strings).  When called without arguments, only matches non-done tasks (i.e. does not match keywords in ~org-done-keywords~).
++  =todo (&rest keywords)= :: Return non-nil if current heading is a ~TODO~ item.  With ~KEYWORDS~, return non-nil if its keyword is one of ~KEYWORDS~ (a list of strings).  When called without arguments, only matches non-done tasks (i.e. does not match keywords in ~org-done-keywords~).
 
 *** Ancestor/descendant predicates
 
@@ -553,6 +554,31 @@ 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.9-pre
+
+*Additions*
++ Face ~org-ql-view-query~, applied to view queries in header line.
++ Face ~org-ql-view-title~, applied to view titles in header line.
++ Option ~org-ql-view-relative-deadline-prefix~.
+
+*Changes*
++ Command ~org-ql-find~ respects narrowing of the current buffer by default, allowing searching within the narrowed region.  (Using one ~C-u~ argument widens the current buffer, and using two ~C-u~ arguments prompts for the buffers to search.)
++ Function ~org-ql-completing-read~ accepts a new ~NARROWP~ argument, which is passed to ~org-ql-select~.
+
+*Fixes*
++ Customization group for face ~org-ql-view-due-date~.
++ Apply Org syntax font-locking to items in ~org-ql-view~ buffers.
+
+*** helm-org-ql
+
+Tagged v0.6.2, fixing a compilation warning.
+
+** 0.8.10
+
+*Fixes*
++ Command ~org-ql-refile~ uses the base buffer when refiling to an indirect buffer.  ([[https://github.com/alphapapa/org-ql/issues/466][#466]].)
++ Predicate ~link~ could signal an error when searching text that is mistakenly recognized as an Org link (e.g. Bash double-bracket constructs in a source block).  (Thanks to [[https://github.com/jwiegley][John Wiegley]] for reporting.)
+
 ** 0.8.9
 
 *Fixes*
@@ -977,6 +1003,14 @@ Simple links may also be written manually in either sexp or non-sexp form, like:
 
 First tagged release.
 
+* Development
+
+Bug reports, feature requests, and suggestions are welcome.  For patches, see below.
+
+** Copyright assignment
+
+While Org QL is currently distributed in MELPA, it's [[https://github.com/alphapapa/org-ql/issues/409][intended]] to merge Org QL into Org mode.  When that happens, it will become a part of Emacs and Org, and therefore cumulative contributions of more than 15 lines of code will require that the author assign copyright of such contributions to the FSF.  Authors who are interested in doing so may contact [[mailto:assign@gnu.org][assign@gnu.org]] to request the appropriate form.
+
 * Notes
 :PROPERTIES:
 :TOC:      :ignore this

helm-org-ql.el

@@ -2,8 +2,8 @@
 
 ;; Author: Adam Porter <adam@alphapapa.net>
 ;; URL: https://github.com/alphapapa/org-ql
-;; Version: 0.6.1
+;; Version: 0.6.2
-;; Package-Requires: ((emacs "26.1") (dash "2.18.1") (s "1.12.0") (helm-org "1.0") (org-ql "0.6-pre"))
+;; Package-Requires: ((emacs "26.1") (compat "29.1.4.5") (dash "2.18.1") (s "1.12.0") (helm-org "1.0") (org-ql "0.6-pre"))
 
 ;;; Commentary:
 
@@ -35,6 +35,7 @@
 (require 'cl-lib)
 (require 'org)
 
+(require 'compat)
 (require 'dash)
 (require 's)
 
@@ -44,6 +45,15 @@
 (require 'org-ql)
 (require 'org-ql-search)
 
+(declare-function org-ql--normalize-query "org-ql" t t)
+
+;;;; Compatibility
+
+(defalias 'helm-org-ql--show-entry
+  (if (version< org-version "9.6")
+      'org-show-entry
+    'org-fold-show-entry))
+
 ;;;; Variables
 
 (defvar helm-org-ql-map
@@ -102,7 +112,7 @@ NAME is passed to `helm-org-ql-source', which see.
 
 NOTE: Atoms in the query are turned into strings where
 appropriate, which makes it unnecessary to type quotation marks
-around words that are intended to be searched for as indepenent
+around words that are intended to be searched for as independent
 strings.
 
 All query tokens are wrapped in the operator BOOLEAN (default
@@ -151,7 +161,7 @@ Is transformed into this query:
   ;; it to go to the previous heading.  I don't know why it does that.
   (switch-to-buffer (marker-buffer marker))
   (goto-char marker)
-  (org-show-entry))
+  (helm-org-ql--show-entry))
 
 (defun helm-org-ql-show-marker-indirect (marker)
   "Show heading at MARKER with `org-tree-to-indirect-buffer'."
@@ -177,7 +187,7 @@ Is transformed into this query:
 
 ;;;###autoload
 (cl-defun helm-org-ql-source (buffers-files &key (name "helm-org-ql"))
-  "Return Helm source named NAME that searches BUFFERS-FILES with `helm-org-ql'."
+  "Return Helm source named NAME to search BUFFERS-FILES with `helm-org-ql'."
   ;; Expansion of `helm-build-sync-source' macro.
   (helm-make-source name 'helm-source-sync
     :candidates (lambda ()
@@ -201,7 +211,7 @@ Is transformed into this query:
 (defun helm-org-ql--heading (window-width)
   "Return string for Helm for heading at point.
 WINDOW-WIDTH should be the width of the Helm window."
-  (font-lock-ensure (point-at-bol) (point-at-eol))
+  (font-lock-ensure (pos-bol) (pos-eol))
   ;; TODO: It would be better to avoid calculating the prefix and width
   ;; at each heading, but there's no easy way to do that once in each
   ;; buffer, unless we manually called `org-ql' in each buffer, which

makem.sh

@@ -3,7 +3,7 @@
 # * makem.sh --- Script to aid building and testing Emacs Lisp packages
 
 # URL: https://github.com/alphapapa/makem.sh
-# Version: 0.6-pre
+# Version: 0.7.1
 
 # * Commentary:
 
@@ -112,6 +112,12 @@ Source files are automatically discovered from git, or may be
 specified with options.  Package dependencies are discovered from
 "Package-Requires" headers in source files, from -pkg.el files, and
 from a Cask file.
+
+Checkdoc's spell checker may not recognize some words, causing the
+`lint-checkdoc' rule to fail.  Custom words can be added in file-local
+or directory-local variables using the variable
+`ispell-buffer-session-localwords', which should be set to a list of
+strings.
 EOF
 }
 
@@ -177,6 +183,7 @@ function elisp-checkdoc-file {
               (setq makem-checkdoc-errors-p t)
               ;; Return nil because we *are* generating a buffered list of errors.
               nil))))
+    (put 'ispell-buffer-session-localwords 'safe-local-variable #'list-of-strings-p)
     (mapcar #'checkdoc-file files)
     (when makem-checkdoc-errors-p
       (kill-emacs 1))))
@@ -300,7 +307,6 @@ function elisp-package-initialize-file {
 (setq package-archives (list (cons "gnu" "https://elpa.gnu.org/packages/")
                              (cons "melpa" "https://melpa.org/packages/")
                              (cons "melpa-stable" "https://stable.melpa.org/packages/")))
-$elisp_org_package_archive
 (package-initialize)
 EOF
     echo $file
@@ -379,6 +385,36 @@ function byte-compile-file {
 
 # ** Files
 
+function submodules {
+    # Echo a list of submodules's paths relative to the repo root.
+    # TODO: Parse with bash regexp instead of cut.
+    git submodule status | awk '{print $2}'
+}
+
+function project-root {
+    # Echo the root of the project (or superproject, if running from
+    # within a submodule).
+    root_dir=$(git rev-parse --show-superproject-working-tree)
+    [[ $root_dir ]] || root_dir=$(git rev-parse --show-toplevel)
+    [[ $root_dir ]] || error "Can't find repo root."
+
+    echo "$root_dir"
+}
+
+function files-project {
+    # Echo a list of files in project; or with $1, files in it
+    # matching that pattern with "git ls-files".  Excludes submodules.
+    [[ $1 ]] && pattern="/$1" || pattern="."
+
+    local excludes
+    for submodule in $(submodules)
+    do
+        excludes+=(":!:$submodule")
+    done
+
+    git ls-files -- "$pattern" "${excludes[@]}"
+}
+
 function dirs-project {
     # Echo list of directories to be used in load path.
     files-project-feature | dirnames
@@ -387,7 +423,7 @@ function dirs-project {
 
 function files-project-elisp {
     # Echo list of Elisp files in project.
-    git ls-files 2>/dev/null \
+    files-project 2>/dev/null \
         | egrep "\.el$" \
         | filter-files-exclude-default \
         | filter-files-exclude-args
@@ -396,13 +432,13 @@ function files-project-elisp {
 function files-project-feature {
     # Echo list of Elisp files that are not tests and provide a feature.
     files-project-elisp \
-        | egrep -v "$test_files_regexp" \
+        | grep -E -v "$test_files_regexp" \
         | filter-files-feature
 }
 
 function files-project-test {
     # Echo list of Elisp test files.
-    files-project-elisp | egrep "$test_files_regexp"
+    files-project-elisp | grep -E "$test_files_regexp"
 }
 
 function dirnames {
@@ -415,7 +451,7 @@ function dirnames {
 
 function filter-files-exclude-default {
     # Filter out paths (STDIN) which should be excluded by default.
-    egrep -v "(/\.cask/|-autoloads.el|.dir-locals)"
+    grep -E -v "(/\.cask/|-autoloads\.el|\.dir-locals)"
 }
 
 function filter-files-exclude-args {
@@ -441,7 +477,7 @@ function filter-files-feature {
     # Read paths on STDIN and echo ones that (provide 'a-feature).
     while read path
     do
-        egrep "^\\(provide '" "$path" &>/dev/null \
+        grep -E "^\\(provide '" "$path" &>/dev/null \
             && echo "$path"
     done
 }
@@ -489,7 +525,7 @@ function ert-tests-p {
 
 function package-main-file {
     # Echo the package's main file.
-    file_pkg=$(git ls-files ./*-pkg.el 2>/dev/null)
+    file_pkg=$(files-project "*-pkg.el" 2>/dev/null)
 
     if [[ $file_pkg ]]
     then
@@ -512,23 +548,23 @@ function dependencies {
 
     # Search package headers.  Use -a so grep won't think that an Elisp file containing
     # control characters (rare, but sometimes necessary) is binary and refuse to search it.
-    egrep -a -i '^;; Package-Requires: ' $(files-project-feature) $(files-project-test) \
+    grep -E -a -i '^;; Package-Requires: ' $(files-project-feature) $(files-project-test) \
-        | egrep -o '\([^([:space:]][^)]*\)' \
+        | grep -E -o '\([^([:space:]][^)]*\)' \
-        | egrep -o '^[^[:space:])]+' \
+        | grep -E -o '^[^[:space:])]+' \
         | sed -r 's/\(//g' \
-        | egrep -v '^emacs$'  # Ignore Emacs version requirement.
+        | grep -E -v '^emacs$'  # Ignore Emacs version requirement.
 
     # Search Cask file.
     if [[ -r Cask ]]
     then
-        egrep '\(depends-on "[^"]+"' Cask \
+        grep -E '\(depends-on "[^"]+"' Cask \
             | sed -r -e 's/\(depends-on "([^"]+)".*/\1/g'
     fi
 
     # Search -pkg.el file.
-    if [[ $(git ls-files ./*-pkg.el 2>/dev/null) ]]
+    if [[ $(files-project "*-pkg.el" 2>/dev/null) ]]
     then
-        sed -nr 's/.*\(([-[:alnum:]]+)[[:blank:]]+"[.[:digit:]]+"\).*/\1/p' $(git ls-files ./*-pkg.el 2>/dev/null)
+        sed -nr 's/.*\(([-[:alnum:]]+)[[:blank:]]+"[.[:digit:]]+"\).*/\1/p' $(files-project- -- -pkg.el 2>/dev/null)
     fi
 }
 
@@ -581,6 +617,9 @@ function sandbox {
         local deps=($(dependencies))
         debug "Installing dependencies: ${deps[@]}"
 
+        # Ensure built-in packages get upgraded to newer versions from ELPA.
+        args_sandbox_package_install+=(--eval "(setq package-install-upgrade-built-in t)")
+
         for package in "${deps[@]}"
         do
             args_sandbox_package_install+=(--eval "(package-install '$package)")
@@ -1084,21 +1123,15 @@ args_package_archives=(
     --eval "(add-to-list 'package-archives '(\"melpa\" . \"https://melpa.org/packages/\") t)"
 )
 
-args_org_package_archives=(
-    --eval "(add-to-list 'package-archives '(\"org\" . \"https://orgmode.org/elpa/\") t)"
-)
-
 args_package_init=(
     --eval "(package-initialize)"
 )
 
-elisp_org_package_archive="(add-to-list 'package-archives '(\"org\" . \"https://orgmode.org/elpa/\") t)"
-
 # * Args
 
 args=$(getopt -n "$0" \
-              -o dhce:E:i:s::vf:CO \
+              -o dhce:E:i:s::vf:C \
-              -l compile-batch,exclude:,emacs:,install-deps,install-linters,debug,debug-load-path,help,install:,verbose,file:,no-color,no-compile,no-org-repo,sandbox:: \
+              -l compile-batch,exclude:,emacs:,install-deps,install-linters,debug,debug-load-path,help,install:,verbose,file:,no-color,no-compile,sandbox:: \
               -- "$@") \
     || { usage; exit 1; }
 eval set -- "$args"
@@ -1162,9 +1195,6 @@ do
             shift
             args_files+=("$1")
             ;;
-        -O|--no-org-repo)
-            unset elisp_org_package_archive
-            ;;
         --no-color)
             unset color
             ;;
@@ -1193,6 +1223,9 @@ paths_temp+=("$package_initialize_file")
 
 trap cleanup EXIT INT TERM
 
+# Change to project root directory first.
+cd "$(project-root)"
+
 # Discover project files.
 files_project_feature=($(files-project-feature))
 files_project_test=($(files-project-test))

org-ql-completing-read.el

@@ -26,6 +26,9 @@
 
 (require 'org-ql)
 
+(declare-function org-ql-search "org-ql-search")
+(declare-function org-ql--normalize-query "org-ql" t t)
+
 ;;;; Variables
 
 (defvar-keymap org-ql-completing-read-map
@@ -131,7 +134,7 @@ value, or nil."
 
 ;;;###autoload
 (cl-defun org-ql-completing-read
-    (buffers-files &key query-prefix query-filter
+    (buffers-files &key query-prefix query-filter narrowp
                    (action #'org-ql-completing-read-action)
                    ;; FIXME: Unused argument.
                    ;; (annotate #'org-ql-completing-read-snippet)
@@ -142,6 +145,8 @@ value, or nil."
   "Return marker at entry in BUFFERS-FILES selected with `org-ql'.
 PROMPT is shown to the user.
 
+NARROWP is passed to `org-ql-select', which see.
+
 QUERY-PREFIX may be a string to prepend to the query entered by
 the user (e.g. use \"heading:\" to only search headings, easily
 creating a custom command that saves the user from having to type
@@ -312,6 +317,7 @@ single predicate)."
                                                 bow (or ,@query-tokens) (0+ (not space))
                                                 (optional (repeat 1 3 (0+ space) (repeat 1 15 (not space))))))))
                     (org-ql-select buffers-files (org-ql--query-string-to-sexp input)
+                      :narrow narrowp
                       :action #'action))))
       (unless (listp buffers-files)
         ;; Since we map across this argument, we ensure it's a list.

org-ql-find.el

@@ -33,6 +33,8 @@
 (require 'org-ql-search)
 (require 'org-ql-completing-read)
 
+(declare-function org-ql--normalize-query "org-ql" t t)
+
 ;;;; Customization
 
 (defgroup org-ql-find nil
@@ -52,14 +54,18 @@ See function `display-buffer'."
 ;;;; Commands
 
 ;;;###autoload
-(cl-defun org-ql-find (buffers-files &key query-prefix query-filter
+(cl-defun org-ql-find (buffers-files &key query-prefix query-filter widen
                                      (prompt "Find entry: "))
   "Go to an Org entry in BUFFERS-FILES selected by searching entries with `org-ql'.
 Interactively, search the buffers and files relevant to the
 current buffer (i.e. in `org-agenda-mode', the value of
 `org-ql-view-buffers-files' or `org-agenda-contributing-files';
-in `org-mode', that buffer).  With universal prefix, select
+in `org-mode', that buffer).
-multiple buffers to search with completion and PROMPT.
+
+With one or more universal prefix arguments, WIDEN buffers before
+searching (otherwise, respect any narrowing).  With two universal
+prefix arguments, select multiple buffers to search with
+completion and PROMPT.
 
 QUERY-PREFIX may be a string to prepend to the query (e.g. use
 \"heading:\" to only search headings, easily creating a custom
@@ -70,11 +76,17 @@ types is filtered before execution (e.g. it could replace spaces
 with commas to turn multiple tokens, which would normally be
 treated as multiple predicates, into multiple arguments to a
 single predicate)."
-  (interactive (list (org-ql-find--buffers)))
+  (interactive (list (org-ql-find--buffers
-  (let ((marker (org-ql-completing-read buffers-files
+                      :read-buffer-p (equal '(16) current-prefix-arg))
+                     :widen current-prefix-arg))
+  (let ((marker (save-restriction
+                  (when (and widen (equal (current-buffer) buffers-files))
+                    (widen))
+                  (org-ql-completing-read buffers-files
+                    :narrowp (not widen)
                     :query-prefix query-prefix
                     :query-filter query-filter
-                  :prompt prompt)))
+                    :prompt prompt))))
     (set-buffer (or (buffer-base-buffer (marker-buffer marker))
                     (marker-buffer marker)))
     (pop-to-buffer (current-buffer) org-ql-find-display-buffer-action)
@@ -110,6 +122,8 @@ which see (but only the files are used)."
                                                                        ((and (pred listp) files) files)))
                                                              (list files-spec)))))))
                  (list (org-ql-completing-read buffers-files :prompt "Refile to: "))))
+  (let ((buffer (or (buffer-base-buffer (marker-buffer marker))
+                    (marker-buffer marker))))
     (org-refile nil nil
                 ;; The RFLOC argument:
                 (list
@@ -117,11 +131,11 @@ which see (but only the files are used)."
                  (org-with-point-at marker
                    (nth 4 (org-heading-components)))
                  ;; File
-               (buffer-file-name (marker-buffer marker))
+                 (buffer-file-name buffer)
                  ;; nil
                  nil
                  ;; Position
-               marker)))
+                 marker))))
 
 ;;;###autoload
 (defun org-ql-find-in-agenda ()
@@ -193,15 +207,15 @@ multiple buffers to search with completion and PROMPT."
 
 ;;;; Functions
 
-(defun org-ql-find--buffers ()
+(cl-defun org-ql-find--buffers (&key read-buffer-p)
-  "Return list of buffers to search in.
+  "Return buffer or list of buffers to search in.
 In a mode derived from `org-agenda-mode', return the value of
 `org-ql-view-buffers-files' or `org-agenda-contributing-files'.
-In a mode derived from `org-mode', return the current buffer.
+In a mode derived from `org-mode', return the current buffer.  If
-When `current-prefix-arg', read a list of buffers in `org-mode'
+READ-BUFFER-P, read a list of buffers in `org-mode' with
-with completion.  To be used in `org-ql-find' commands'
+completion.  To be used in `org-ql-find' commands' interactive
-interactive forms."
+forms."
-  (if current-prefix-arg
+  (if read-buffer-p
       (mapcar #'get-buffer
               (completing-read-multiple
                "Buffers: "

org-ql-search.el

@@ -40,6 +40,8 @@
 (require 'org-ql)
 (require 'org-ql-view)
 
+(declare-function org-ql--normalize-query "org-ql" t t)
+
 ;;;; Compatibility
 
 (defalias 'org-ql-search--link-heading-search-string
@@ -220,23 +222,28 @@ necessary."
                                          (symbol (symbol-value super-groups))
                                          (list super-groups))))
           (setf strings (org-super-agenda--group-items strings))))
-      (org-ql-view--display :buffer buffer :header header
+      (org-ql-view--display :buffer buffer :header header :strings strings))))
-        :string (s-join "\n" strings)))))
 
 ;;;###autoload
-(defun org-ql-search-block (query)
+(defun org-ql-search-block (args)
-  "Insert items for QUERY into current buffer.
+  "Insert items for ARGS into current buffer.
-QUERY should be an `org-ql' query form.  Intended to be used as a
+Intended to be used as a user-defined function in
-user-defined function in `org-agenda-custom-commands'.  QUERY
+`org-agenda-custom-commands'.  ARGS corresponds to the `match'
-corresponds to the `match' item in the custom command form.
+item in the custom command form.  It should be a list of
+arguments which may be applied to `org-ql-select', which see, but
+not including its BUFFERS-FILES argument (which is supplied
+through the Agenda).  An additional `:header' keyword argument
+may be supplied as a string, like that supplied to
+`org-ql-view--display'.
 
 Like other agenda block commands, it searches files returned by
 function `org-agenda-files'.  Inserts a newline after the block.
 
 If `org-ql-block-header' is non-nil, it is used as the header
-string for the block, otherwise a the header is formed
+string for the block, otherwise the header is formed
 automatically from the query."
-  (let (narrow-p old-beg old-end)
+  (pcase-let ((`(,query . ,(map :header :sort)) args)
+              (narrow-p) (old-beg) (old-end))
     (when-let* ((from (pcase org-agenda-restrict
                         ('nil (org-agenda-files nil 'ifmode))
                         (_ (prog1 org-agenda-restrict
@@ -247,7 +254,7 @@ automatically from the query."
 			       (narrow-to-region org-agenda-restrict-begin org-agenda-restrict-end))))))
                 (items (org-ql-select from query
                          :action 'element-with-markers
-                         :narrow narrow-p)))
+                         :narrow narrow-p :sort sort)))
       (when narrow-p
         ;; Restore buffer's previous restrictions.
         (with-current-buffer from
@@ -257,16 +264,25 @@ automatically from the query."
       ;; FIXME: `org-agenda--insert-overriding-header' is from an Org version newer than
       ;; I'm using.  Should probably declare it as a minimum Org version after upgrading.
       ;;  (org-agenda--insert-overriding-header (or org-ql-block-header (org-ql-agenda--header-line-format from query)))
-      (insert (org-add-props (or org-ql-block-header (org-ql-view--header-line-format
+      ;; FIXME: Should we really use `org-ql-block-header' AND `header', or just one of them?
+      (insert (org-add-props (or org-ql-block-header header
+                                 (org-ql-view--header-line-format
                                   :buffers-files from :query query))
                   nil 'face 'org-agenda-structure) "\n")
       ;; Calling `org-agenda-finalize' should be unnecessary, because in a "series" agenda,
       ;; `org-agenda-multi' is bound non-nil, in which case `org-agenda-finalize' does nothing.
       ;; But we do call `org-agenda-finalize-entries', which allows `org-super-agenda' to work.
+      ;; However, `org-agenda-finalize-entries' sorts entries with `org-entries-lessp', which
+      ;; overrides the sorting `org-ql' has already done, so we rebind `org-entries-lessp' to
+      ;; prevent it from affecting sort order.  (Ideally we would let `org-entries-lessp'
+      ;; handle sorting, but that's not possible, because we can't add the `type' text property
+      ;; it uses to sort entries, because the design of org-ql and org-agenda is fundamentally
+      ;; different.  So we have to do the sorting ourselves.)
+      (cl-letf (((symbol-function 'org-entries-lessp) #'ignore))
         (->> items
              (-map #'org-ql-view--format-element)
              org-agenda-finalize-entries
-           insert)
+             insert))
       (insert "\n"))))
 
 ;;;###autoload

org-ql-view.el

@@ -44,6 +44,7 @@
 
 (declare-function org-ql-search "org-ql-search" t)
 (declare-function org-ql-search--org-link-store-props "org-ql-search" t)
+(declare-function org-ql--normalize-query "org-ql" t t)
 
 (require 'dash)
 (require 's)
@@ -56,7 +57,18 @@
 (defface org-ql-view-due-date
   '((t (:slant italic :weight bold)))
   "Face for due dates in `org-ql-view' views."
-  :group 'org-ql)
+  :group 'org-ql-view)
+
+(defface org-ql-view-query nil
+  "View query in header line.
+This face is added to the formatted query after font-lock faces
+are applied to it.  It may be used, e.g. to reduce the height so
+more of it is visible."
+  :group 'org-ql-view)
+
+(defface org-ql-view-title '((t :weight bold))
+  "View title in header line."
+  :group 'org-ql-view)
 
 ;;;; Variables
 
@@ -237,6 +249,12 @@ See info node `(elisp)Cyclic Window Ordering'."
                                       (sexp :tag "org-super-agenda grouping expression")
                                       (variable :tag "Variable holding org-super-agenda  grouping expression"))))))))
 
+(defcustom org-ql-view-relative-deadline-prefix "due "
+  ;; TODO(v0.9): Add one for scheduled, too.
+  "Prefix for relative deadlines.
+Relative deadlines are, e.g. \"in 5d\", \"5d ago\"."
+  :type 'string)
+
 ;;;; Commands
 
 ;;;###autoload
@@ -408,7 +426,7 @@ update search arguments."
 
 (defvar bookmark-make-record-function)
 
-(cl-defun org-ql-view--display (&key (buffer org-ql-view-buffer) header string)
+(cl-defun org-ql-view--display (&key (buffer org-ql-view-buffer) header strings)
   "Display STRING in `org-ql-view' BUFFER.
 
 BUFFER may be a buffer, or a string naming a buffer, which is
@@ -446,7 +464,9 @@ subsequent refreshing of the buffer: `org-ql-view-buffers-files',
       ;; Clear buffer, insert entries, etc.
       (let ((inhibit-read-only t))
         (erase-buffer)
-        (insert string "\n")
+        (dolist (string strings)
+          (insert string "\n"))
+        (insert "\n")
         (pop-to-buffer (current-buffer) org-ql-view-display-buffer-action)
         (org-agenda-finalize)
         (goto-char (point-min))))))
@@ -456,7 +476,8 @@ subsequent refreshing of the buffer: `org-ql-view-buffers-files',
 If TITLE, prepend it to the header."
   (let* ((title (if title
                     (concat (propertize "View:" 'face 'transient-argument)
-                            title " ")
+                            (propertize title 'face 'org-ql-view-title)
+                            " ")
                   ""))
          (query-formatted (when query
                             (org-ql-view--format-query query)))
@@ -475,6 +496,7 @@ If TITLE, prepend it to the header."
                                                      (org-ql-view--font-lock-string 'emacs-lisp-mode)
                                                      (s-truncate available-width))
                                                 'help-echo buffers-files-formatted))))
+    (add-face-text-property 0 (length query-propertized) 'org-ql-view-query 'append query-propertized)
     (concat title
             (when query (propertize "Query:" 'face 'transient-argument))
             (when query query-propertized)
@@ -506,6 +528,22 @@ with human-readable strings."
       (font-lock-ensure)
       (buffer-string))))
 
+(defun org-ql-view--font-lock-as-org (s)
+  "Return string S font-locked as in `org-mode'."
+  ;; This works like `org-fontify-like-in-org-mode', but uses a single
+  ;; buffer instead of a new one every time.
+  ;; TODO(C): Submit these improvements upstream.
+  (let ((buffer (or (get-buffer " *org-ql-view--font-lock-as-org*")
+                    (with-current-buffer (get-buffer-create " *org-ql-view--font-lock-as-org*")
+                      (buffer-disable-undo)
+                      (org-mode)
+                      (current-buffer)))))
+    (with-current-buffer buffer
+      (insert s)
+      (font-lock-ensure)
+      (prog1 (buffer-string)
+        (erase-buffer)))))
+
 (defun org-ql-view--buffer (&optional name)
   "Return `org-ql-view' buffer, creating it if necessary.
 If NAME is non-nil, return buffer by that name instead of using
@@ -608,6 +646,7 @@ The optional, second argument is temporarily _IGNORED for
 purposes of compatibility with changes in Org 9.4."
   (require 'url-parse)
   (require 'url-util)
+  (declare-function url-path-and-query "url-parse")
   (when (version<= "9.3" (org-version))
     ;; Org 9.3+ makes a backward-incompatible change to link escaping.
     ;; I don't think it would be a good idea to try to guess whether
@@ -641,6 +680,8 @@ purposes of compatibility with changes in Org 9.4."
                 (stringp buffers-files)
                 (cl-every #'stringp buffers-files))
       (error "CAUTION: Link not opened because unsafe buffers-files parameter detected: %s" buffers-files))
+    (unless (or (stringp title) (null title))
+      (error "CAUTION: Link not opened because unsafe title parameter detected: %S" title))
     (when (or (listp query)
               (string-match (rx bol (0+ space) "(") query))
       ;; SAFETY: Query is in sexp form: ask for confirmation, because it could contain arbitrary code.
@@ -709,6 +750,8 @@ When opened, the link searches the buffer it's opened from."
 ;; Transient manual is written very well, not everything is covered in
 ;; it, so I'm having to try to imitate examples from `magit-transient'.
 
+(require 'eieio-core)
+
 (require 'transient)
 
 (defclass org-ql-view--variable (transient-variable)
@@ -871,6 +914,11 @@ return an empty string."
            ;; (which would also make it easier to do it independently of faces, etc).
            (title (--> (org-ql-view--add-faces element)
                        (org-element-property :raw-value it)))
+           ;; TODO(B): Needs refactoring.  A function like `org-ql-view--add-faces'
+           ;; should return a list of faces to be added.
+           (title-faces (get-text-property 0 'face title))
+           (title (org-ql-view--font-lock-as-org title))
+           (_ (add-face-text-property 0 (length title) title-faces t title))
            (todo-keyword (-some--> (org-element-property :todo-keyword element)
                            (org-ql-view--add-todo-face
                             (substring-no-properties it))))
@@ -1008,7 +1056,9 @@ property."
              (deadline-day-number (org-time-string-to-absolute
                                    (org-element-timestamp-interpreter deadline-date 'ignore)))
              (difference-days (- today-day-number deadline-day-number))
-             (relative-due-date (org-add-props (org-ql-view--format-relative-date difference-days) nil
+             (relative-due-date (org-add-props
+                                    (concat org-ql-view-relative-deadline-prefix
+                                            (org-ql-view--format-relative-date difference-days)) nil
                                   'help-echo (org-element-property :raw-value deadline-date)))
              ;; FIXME: Unused for now: (todo-keyword (org-element-property :todo-keyword element))
              ;; FIXME: Unused for now: (done-p (member todo-keyword org-done-keywords))

org-ql.el

@@ -4,7 +4,7 @@
 
 ;; Author: Adam Porter <adam@alphapapa.net>
 ;; Url: https://github.com/alphapapa/org-ql
-;; Version: 0.8.9
+;; Version: 0.9-pre
 ;; Package-Requires: ((emacs "27.1") (compat "29.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
 
@@ -1626,11 +1626,15 @@ any link is found."
                          (or (null description)
                              (string-match-p description (match-string org-ql-link-description-group)))))
               (_ (if (and description target)
-                     (and (string-match-p target (match-string 1))
+                     (and (and (match-string 1)
-                          (string-match-p description (match-string org-ql-link-description-group)))
+                               (string-match-p target (match-string 1)))
-                   (or (string-match-p description-or-target (match-string 1))
+                          (and (match-string org-ql-link-description-group)
+                               (string-match-p description (match-string org-ql-link-description-group))))
+                   (or (and (match-string 1)
+                            (string-match-p description-or-target (match-string 1)))
+                       (and (match-string org-ql-link-description-group)
                             (string-match-p description-or-target
-                                       (match-string org-ql-link-description-group)))))))))
+                                            (match-string org-ql-link-description-group))))))))))
 
 (org-ql-defpred (rifle smart) (&rest strings)
   "Return non-nil if each of strings is found in the entry or its outline path.

org-ql.info

@@ -26,6 +26,7 @@ and saved views.
 * Installation::
 * Usage::
 * Changelog::
+* Development::
 * Notes::
 * License::
 
@@ -72,6 +73,8 @@ Functions / Macros
 
 Changelog
 
+* 0.9-pre: 09-pre.
+* 0.8.10: 0810.
 * 0.8.9: 089.
 * 0.8.8: 088.
 * 0.8.7: 087.
@@ -113,6 +116,14 @@ Changelog
 * 0.2: 02.
 * 0.1: 01.
 
+0.9-pre
+
+* helm-org-ql: helm-org-ql (1).
+
+Development
+
+* Copyright assignment::
+
 Notes
 
 * Comparison with Org Agenda searches::
@@ -125,7 +136,7 @@ File: README.info,  Node: Contents,  Next: Screenshots,  Prev: Top,  Up: Top
 1 Contents
 **********
 
-   • • • • 
+   • • • • • 
 
 File: README.info,  Node: Screenshots,  Next: Installation,  Prev: Contents,  Up: Top
 
@@ -1024,7 +1035,7 @@ File: README.info,  Node: Tips,  Prev: Links,  Up: Usage
      (https://github.com/alphapapa/burly.el).
 
 
-File: README.info,  Node: Changelog,  Next: Notes,  Prev: Usage,  Up: Top
+File: README.info,  Node: Changelog,  Next: Development,  Prev: Usage,  Up: Top
 
 5 Changelog
 ***********
@@ -1037,6 +1048,8 @@ releases.
 
 * Menu:
 
+* 0.9-pre: 09-pre.
+* 0.8.10: 0810.
 * 0.8.9: 089.
 * 0.8.8: 088.
 * 0.8.7: 087.
@@ -1079,9 +1092,59 @@ releases.
 * 0.1: 01.
 
 
-File: README.info,  Node: 089,  Next: 088,  Up: Changelog
+File: README.info,  Node: 09-pre,  Next: 0810,  Up: Changelog
 
-5.1 0.8.9
+5.1 0.9-pre
+===========
+
+*Additions*
+   • Face ‘org-ql-view-query’, applied to view queries in header line.
+   • Face ‘org-ql-view-title’, applied to view titles in header line.
+   • Option ‘org-ql-view-relative-deadline-prefix’.
+
+   *Changes*
+   • Command ‘org-ql-find’ respects narrowing of the current buffer by
+     default, allowing searching within the narrowed region.  (Using one
+     ‘C-u’ argument widens the current buffer, and using two ‘C-u’
+     arguments prompts for the buffers to search.)
+   • Function ‘org-ql-completing-read’ accepts a new ‘NARROWP’ argument,
+     which is passed to ‘org-ql-select’.
+
+   *Fixes*
+   • Customization group for face ‘org-ql-view-due-date’.
+   • Apply Org syntax font-locking to items in ‘org-ql-view’ buffers.
+
+* Menu:
+
+* helm-org-ql: helm-org-ql (1).
+
+
+File: README.info,  Node: helm-org-ql (1),  Up: 09-pre
+
+5.1.1 helm-org-ql
+-----------------
+
+Tagged v0.6.2, fixing a compilation warning.
+
+
+File: README.info,  Node: 0810,  Next: 089,  Prev: 09-pre,  Up: Changelog
+
+5.2 0.8.10
+==========
+
+*Fixes*
+   • Command ‘org-ql-refile’ uses the base buffer when refiling to an
+     indirect buffer.  (#466
+     (https://github.com/alphapapa/org-ql/issues/466).)
+   • Predicate ‘link’ could signal an error when searching text that is
+     mistakenly recognized as an Org link (e.g.  Bash double-bracket
+     constructs in a source block).  (Thanks to John Wiegley
+     (https://github.com/jwiegley) for reporting.)
+
+
+File: README.info,  Node: 089,  Next: 088,  Prev: 0810,  Up: Changelog
+
+5.3 0.8.9
 =========
 
 *Fixes*
@@ -1108,7 +1171,7 @@ File: README.info,  Node: 089,  Next: 088,  Up: Changelog
 
 File: README.info,  Node: 088,  Next: 087,  Prev: 089,  Up: Changelog
 
-5.2 0.8.8
+5.4 0.8.8
 =========
 
 *Fixes*
@@ -1130,7 +1193,7 @@ File: README.info,  Node: 088,  Next: 087,  Prev: 089,  Up: Changelog
 
 File: README.info,  Node: 087,  Next: 086,  Prev: 088,  Up: Changelog
 
-5.3 0.8.7
+5.5 0.8.7
 =========
 
 *Fixes*
@@ -1158,7 +1221,7 @@ File: README.info,  Node: 087,  Next: 086,  Prev: 088,  Up: Changelog
 
 File: README.info,  Node: 086,  Next: 085,  Prev: 087,  Up: Changelog
 
-5.4 0.8.6
+5.6 0.8.6
 =========
 
 *Fixes*
@@ -1168,7 +1231,7 @@ File: README.info,  Node: 086,  Next: 085,  Prev: 087,  Up: Changelog
 
 File: README.info,  Node: 085,  Next: 084,  Prev: 086,  Up: Changelog
 
-5.5 0.8.5
+5.7 0.8.5
 =========
 
 *Fixes*
@@ -1185,7 +1248,7 @@ File: README.info,  Node: 085,  Next: 084,  Prev: 086,  Up: Changelog
 
 File: README.info,  Node: 084,  Next: 083,  Prev: 085,  Up: Changelog
 
-5.6 0.8.4
+5.8 0.8.4
 =========
 
 *Fixes*
@@ -1199,7 +1262,7 @@ File: README.info,  Node: 084,  Next: 083,  Prev: 085,  Up: Changelog
 
 File: README.info,  Node: 083,  Next: 082,  Prev: 084,  Up: Changelog
 
-5.7 0.8.3
+5.9 0.8.3
 =========
 
 *Fixes*
@@ -1212,8 +1275,8 @@ File: README.info,  Node: 083,  Next: 082,  Prev: 084,  Up: Changelog
 
 File: README.info,  Node: 082,  Next: 081,  Prev: 083,  Up: Changelog
 
-5.8 0.8.2
+5.10 0.8.2
-=========
+==========
 
 *Fixes*
 
@@ -1226,8 +1289,8 @@ File: README.info,  Node: 082,  Next: 081,  Prev: 083,  Up: Changelog
 
 File: README.info,  Node: 081,  Next: 08,  Prev: 082,  Up: Changelog
 
-5.9 0.8.1
+5.11 0.8.1
-=========
+==========
 
 *Fixes*
 
@@ -1241,7 +1304,7 @@ File: README.info,  Node: 081,  Next: 08,  Prev: 082,  Up: Changelog
 
 File: README.info,  Node: 08,  Next: 074,  Prev: 081,  Up: Changelog
 
-5.10 0.8
+5.12 0.8
 ========
 
 *Additions*
@@ -1297,7 +1360,7 @@ File: README.info,  Node: 08,  Next: 074,  Prev: 081,  Up: Changelog
 
 File: README.info,  Node: 074,  Next: 073,  Prev: 08,  Up: Changelog
 
-5.11 0.7.4
+5.13 0.7.4
 ==========
 
 *Fixes*
@@ -1307,7 +1370,7 @@ File: README.info,  Node: 074,  Next: 073,  Prev: 08,  Up: Changelog
 
 File: README.info,  Node: 073,  Next: 072,  Prev: 074,  Up: Changelog
 
-5.12 0.7.3
+5.14 0.7.3
 ==========
 
 *Fixes*
@@ -1325,7 +1388,7 @@ File: README.info,  Node: 073,  Next: 072,  Prev: 074,  Up: Changelog
 
 File: README.info,  Node: 072,  Next: 071,  Prev: 073,  Up: Changelog
 
-5.13 0.7.2
+5.15 0.7.2
 ==========
 
 *Fixes*
@@ -1346,7 +1409,7 @@ File: README.info,  Node: 072,  Next: 071,  Prev: 073,  Up: Changelog
 
 File: README.info,  Node: 071,  Next: 07,  Prev: 072,  Up: Changelog
 
-5.14 0.7.1
+5.16 0.7.1
 ==========
 
 *Fixes*
@@ -1365,7 +1428,7 @@ File: README.info,  Node: 071,  Next: 07,  Prev: 072,  Up: Changelog
 
 File: README.info,  Node: 07,  Next: 063,  Prev: 071,  Up: Changelog
 
-5.15 0.7
+5.17 0.7
 ========
 
 *Added*
@@ -1424,7 +1487,7 @@ File: README.info,  Node: 07,  Next: 063,  Prev: 071,  Up: Changelog
 
 File: README.info,  Node: 063,  Next: 062,  Prev: 07,  Up: Changelog
 
-5.16 0.6.3
+5.18 0.6.3
 ==========
 
 *Fixed*
@@ -1440,7 +1503,7 @@ File: README.info,  Node: 063,  Next: 062,  Prev: 07,  Up: Changelog
 
 File: README.info,  Node: 062,  Next: 061,  Prev: 063,  Up: Changelog
 
-5.17 0.6.2
+5.19 0.6.2
 ==========
 
 *Fixed*
@@ -1451,7 +1514,7 @@ File: README.info,  Node: 062,  Next: 061,  Prev: 063,  Up: Changelog
 
 File: README.info,  Node: 061,  Next: 06,  Prev: 062,  Up: Changelog
 
-5.18 0.6.1
+5.20 0.6.1
 ==========
 
 *Fixed*
@@ -1469,7 +1532,7 @@ File: README.info,  Node: 061,  Next: 06,  Prev: 062,  Up: Changelog
 
 File: README.info,  Node: 06,  Next: 052,  Prev: 061,  Up: Changelog
 
-5.19 0.6
+5.21 0.6
 ========
 
 *Added*
@@ -1536,7 +1599,7 @@ File: README.info,  Node: 06,  Next: 052,  Prev: 061,  Up: Changelog
 
 File: README.info,  Node: 052,  Next: 051,  Prev: 06,  Up: Changelog
 
-5.20 0.5.2
+5.22 0.5.2
 ==========
 
 *Fixed*
@@ -1547,7 +1610,7 @@ File: README.info,  Node: 052,  Next: 051,  Prev: 06,  Up: Changelog
 
 File: README.info,  Node: 051,  Next: 05,  Prev: 052,  Up: Changelog
 
-5.21 0.5.1
+5.23 0.5.1
 ==========
 
 *Fixed*
@@ -1560,7 +1623,7 @@ File: README.info,  Node: 051,  Next: 05,  Prev: 052,  Up: Changelog
 
 File: README.info,  Node: 05,  Next: 049,  Prev: 051,  Up: Changelog
 
-5.22 0.5
+5.24 0.5
 ========
 
 *Added*
@@ -1601,7 +1664,7 @@ File: README.info,  Node: 05,  Next: 049,  Prev: 051,  Up: Changelog
 
 File: README.info,  Node: 049,  Next: 048,  Prev: 05,  Up: Changelog
 
-5.23 0.4.9
+5.25 0.4.9
 ==========
 
 *Fixed*
@@ -1612,7 +1675,7 @@ File: README.info,  Node: 049,  Next: 048,  Prev: 05,  Up: Changelog
 
 File: README.info,  Node: 048,  Next: 047,  Prev: 049,  Up: Changelog
 
-5.24 0.4.8
+5.26 0.4.8
 ==========
 
 *Fixed*
@@ -1624,7 +1687,7 @@ File: README.info,  Node: 048,  Next: 047,  Prev: 049,  Up: Changelog
 
 File: README.info,  Node: 047,  Next: 046,  Prev: 048,  Up: Changelog
 
-5.25 0.4.7
+5.27 0.4.7
 ==========
 
 *Fixed*
@@ -1637,7 +1700,7 @@ File: README.info,  Node: 047,  Next: 046,  Prev: 048,  Up: Changelog
 
 File: README.info,  Node: 046,  Next: 045,  Prev: 047,  Up: Changelog
 
-5.26 0.4.6
+5.28 0.4.6
 ==========
 
 *Fixed*
@@ -1650,7 +1713,7 @@ File: README.info,  Node: 046,  Next: 045,  Prev: 047,  Up: Changelog
 
 File: README.info,  Node: 045,  Next: 044,  Prev: 046,  Up: Changelog
 
-5.27 0.4.5
+5.29 0.4.5
 ==========
 
 *Fixed*
@@ -1662,7 +1725,7 @@ File: README.info,  Node: 045,  Next: 044,  Prev: 046,  Up: Changelog
 
 File: README.info,  Node: 044,  Next: 043,  Prev: 045,  Up: Changelog
 
-5.28 0.4.4
+5.30 0.4.4
 ==========
 
 *Fixed*
@@ -1674,7 +1737,7 @@ File: README.info,  Node: 044,  Next: 043,  Prev: 045,  Up: Changelog
 
 File: README.info,  Node: 043,  Next: 042,  Prev: 044,  Up: Changelog
 
-5.29 0.4.3
+5.31 0.4.3
 ==========
 
 *Fixed*
@@ -1684,7 +1747,7 @@ File: README.info,  Node: 043,  Next: 042,  Prev: 044,  Up: Changelog
 
 File: README.info,  Node: 042,  Next: 041,  Prev: 043,  Up: Changelog
 
-5.30 0.4.2
+5.32 0.4.2
 ==========
 
 *Fixed*
@@ -1693,7 +1756,7 @@ File: README.info,  Node: 042,  Next: 041,  Prev: 043,  Up: Changelog
 
 File: README.info,  Node: 041,  Next: 04,  Prev: 042,  Up: Changelog
 
-5.31 0.4.1
+5.33 0.4.1
 ==========
 
 *Fixed*
@@ -1703,7 +1766,7 @@ File: README.info,  Node: 041,  Next: 04,  Prev: 042,  Up: Changelog
 
 File: README.info,  Node: 04,  Next: 032,  Prev: 041,  Up: Changelog
 
-5.32 0.4
+5.34 0.4
 ========
 
 _Note:_ The next release, 0.5, may include changes which will require
@@ -1784,7 +1847,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.33 0.3.2
+5.35 0.3.2
 ==========
 
 *Fixed*
@@ -1797,7 +1860,7 @@ File: README.info,  Node: 032,  Next: 031,  Prev: 04,  Up: Changelog
 
 File: README.info,  Node: 031,  Next: 03,  Prev: 032,  Up: Changelog
 
-5.34 0.3.1
+5.36 0.3.1
 ==========
 
 *Fixed*
@@ -1807,7 +1870,7 @@ File: README.info,  Node: 031,  Next: 03,  Prev: 032,  Up: Changelog
 
 File: README.info,  Node: 03,  Next: 023,  Prev: 031,  Up: Changelog
 
-5.35 0.3
+5.37 0.3
 ========
 
 *Added*
@@ -1875,7 +1938,7 @@ File: README.info,  Node: 03,  Next: 023,  Prev: 031,  Up: Changelog
 
 File: README.info,  Node: 023,  Next: 022,  Prev: 03,  Up: Changelog
 
-5.36 0.2.3
+5.38 0.2.3
 ==========
 
 *Fixed*
@@ -1885,7 +1948,7 @@ File: README.info,  Node: 023,  Next: 022,  Prev: 03,  Up: Changelog
 
 File: README.info,  Node: 022,  Next: 021,  Prev: 023,  Up: Changelog
 
-5.37 0.2.2
+5.39 0.2.2
 ==========
 
 *Fixed*
@@ -1896,7 +1959,7 @@ File: README.info,  Node: 022,  Next: 021,  Prev: 023,  Up: Changelog
 
 File: README.info,  Node: 021,  Next: 02,  Prev: 022,  Up: Changelog
 
-5.38 0.2.1
+5.40 0.2.1
 ==========
 
 *Fixed*
@@ -1906,7 +1969,7 @@ File: README.info,  Node: 021,  Next: 02,  Prev: 022,  Up: Changelog
 
 File: README.info,  Node: 02,  Next: 01,  Prev: 021,  Up: Changelog
 
-5.39 0.2
+5.41 0.2
 ========
 
 *Added*
@@ -1989,15 +2052,42 @@ File: README.info,  Node: 02,  Next: 01,  Prev: 021,  Up: Changelog
 
 File: README.info,  Node: 01,  Prev: 02,  Up: Changelog
 
-5.40 0.1
+5.42 0.1
 ========
 
 First tagged release.
 
 
-File: README.info,  Node: Notes,  Next: License,  Prev: Changelog,  Up: Top
+File: README.info,  Node: Development,  Next: Notes,  Prev: Changelog,  Up: Top
 
-6 Notes
+6 Development
+*************
+
+Bug reports, feature requests, and suggestions are welcome.  For
+patches, see below.
+
+* Menu:
+
+* Copyright assignment::
+
+
+File: README.info,  Node: Copyright assignment,  Up: Development
+
+6.1 Copyright assignment
+========================
+
+While Org QL is currently distributed in MELPA, it’s intended
+(https://github.com/alphapapa/org-ql/issues/409) to merge Org QL into
+Org mode.  When that happens, it will become a part of Emacs and Org,
+and therefore cumulative contributions of more than 15 lines of code
+will require that the author assign copyright of such contributions to
+the FSF.  Authors who are interested in doing so may contact
+assign@gnu.org <assign@gnu.org> to request the appropriate form.
+
+
+File: README.info,  Node: Notes,  Next: License,  Prev: Development,  Up: Top
+
+7 Notes
 *******
 
 * Menu:
@@ -2008,7 +2098,7 @@ File: README.info,  Node: Notes,  Next: License,  Prev: Changelog,  Up: Top
 
 File: README.info,  Node: Comparison with Org Agenda searches,  Next: org-sidebar,  Up: Notes
 
-6.1 Comparison with Org Agenda searches
+7.1 Comparison with Org Agenda searches
 =======================================
 
 Of course, queries like these can already be written with Org Agenda
@@ -2028,7 +2118,7 @@ todo:TO-READ’, or in Lisp syntax, ‘(and "lisp" (todo "TO-READ"))’.
 
 File: README.info,  Node: org-sidebar,  Prev: Comparison with Org Agenda searches,  Up: Notes
 
-6.2 org-sidebar
+7.2 org-sidebar
 ===============
 
 This package is used by org-sidebar
@@ -2038,7 +2128,7 @@ customizable agenda-like view in a sidebar window.
 
 File: README.info,  Node: License,  Prev: Notes,  Up: Top
 
-7 License
+8 License
 *********
 
 GPLv3
@@ -2047,85 +2137,90 @@ GPLv3
 
 Tag Table:
 Node: Top225
-Node: Contents1977
+Node: Contents2109
-Node: Screenshots2100
+Node: Screenshots2236
-Node: Installation2218
+Node: Installation2354
-Node: Quelpa2732
+Node: Quelpa2868
-Node: Helm support3260
+Node: Helm support3396
-Node: Usage3663
+Node: Usage3799
-Node: Commands4061
+Node: Commands4197
-Node: org-ql-find4526
+Node: org-ql-find4662
-Node: org-ql-open-link5434
+Node: org-ql-open-link5570
-Node: org-ql-refile6289
+Node: org-ql-refile6425
-Node: org-ql-search6617
+Node: org-ql-search6753
-Node: helm-org-ql8548
+Node: helm-org-ql8684
-Node: org-ql-view8926
+Node: org-ql-view9062
-Node: org-ql-view-sidebar9456
+Node: org-ql-view-sidebar9592
-Node: org-ql-view-recent-items9836
+Node: org-ql-view-recent-items9972
-Node: org-ql-sparse-tree10332
+Node: org-ql-sparse-tree10468
-Node: Queries11132
+Node: Queries11268
-Node: Non-sexp query syntax12249
+Node: Non-sexp query syntax12385
-Node: General predicates14008
+Node: General predicates14144
-Node: Ancestor/descendant predicates20933
+Node: Ancestor/descendant predicates21069
-Node: Date/time predicates22061
+Node: Date/time predicates22197
-Node: Functions / Macros25185
+Node: Functions / Macros25321
-Node: Agenda-like views25483
+Node: Agenda-like views25619
-Ref: Function org-ql-block25645
+Ref: Function org-ql-block25781
-Node: Listing / acting-on results26906
+Node: Listing / acting-on results27042
-Ref: Caching27114
+Ref: Caching27250
-Ref: Function org-ql-select28027
+Ref: Function org-ql-select28163
-Ref: Function org-ql-query30453
+Ref: Function org-ql-query30589
-Ref: Macro org-ql (deprecated)32227
+Ref: Macro org-ql (deprecated)32363
-Node: Custom predicates32542
+Node: Custom predicates32678
-Ref: Macro org-ql-defpred32766
+Ref: Macro org-ql-defpred32902
-Node: Dynamic block36207
+Node: Dynamic block36343
-Node: Links38931
+Node: Links39067
-Node: Tips39618
+Node: Tips39754
-Node: Changelog39942
+Node: Changelog40078
-Node: 08940884
+Node: 09-pre41061
-Node: 08842011
+Node: helm-org-ql (1)41987
-Node: 08743087
+Node: 081042128
-Node: 08644315
+Node: 08942657
-Node: 08544549
+Node: 08843797
-Node: 08445205
+Node: 08744873
-Node: 08345657
+Node: 08646101
-Node: 08245998
+Node: 08546335
-Node: 08146391
+Node: 08446991
-Node: 0846812
+Node: 08347443
-Node: 07449538
+Node: 08247784
-Node: 07349763
+Node: 08148179
-Node: 07250497
+Node: 0848602
-Node: 07151418
+Node: 07451328
-Node: 0752229
+Node: 07351553
-Node: 06355095
+Node: 07252287
-Node: 06255628
+Node: 07153208
-Node: 06155935
+Node: 0754019
-Node: 0656505
+Node: 06356885
-Node: 05259561
+Node: 06257418
-Node: 05159863
+Node: 06157725
-Node: 0560288
+Node: 0658295
-Node: 04961819
+Node: 05261351
-Node: 04862101
+Node: 05161653
-Node: 04762450
+Node: 0562078
-Node: 04662859
+Node: 04963609
-Node: 04563267
+Node: 04863891
-Node: 04463628
+Node: 04764240
-Node: 04363987
+Node: 04664649
-Node: 04264190
+Node: 04565057
-Node: 04164351
+Node: 04465418
-Node: 0464598
+Node: 04365777
-Node: 03268699
+Node: 04265980
-Node: 03169102
+Node: 04166141
-Node: 0369299
+Node: 0466388
-Node: 02372599
+Node: 03270489
-Node: 02272833
+Node: 03170892
-Node: 02173113
+Node: 0371089
-Node: 0273318
+Node: 02374389
-Node: 0177396
+Node: 02274623
-Node: Notes77497
+Node: 02174903
-Node: Comparison with Org Agenda searches77659
+Node: 0275108
-Node: org-sidebar78548
+Node: 0179186
-Node: License78827
+Node: Development79287
+Node: Copyright assignment79520
+Node: Notes80110
+Node: Comparison with Org Agenda searches80274
+Node: org-sidebar81163
+Node: License81442
 
 End Tag Table
 

tests/data-ts.org

@@ -21,7 +21,7 @@ DEADLINE: <2024-06-25 Tue 08:00-09:00 ++7d>
 
 ** French
 
-<2024-07-12 Fri>
+<2024-07-12 ven.>
 
 * Canary
 

tests/test-org-ql.el

@@ -3,7 +3,7 @@
 ;; Copyright (C) 2019 Adam Porter
 
 ;; Author: Adam Porter <adam@alphapapa.net>
-;; Package-Requires: ((buttercup) (with-simulated-input))
+;; Package-Requires: ((buttercup) (with-simulated-input) (xr))
 
 ;; This program is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
@@ -35,6 +35,8 @@
 
 (require 'xr)
 
+(declare-function org-ql--normalize-query "org-ql" t t)
+
 ;;;; Variables
 
 (defvar org-ql-test-buffer nil
@@ -1984,13 +1986,13 @@ with keyword arg NOW in PLIST."
                 (expression-link "[[org-ql-search:todo:?title%3D%28error%20%22UNSAFE%22%29]]"))
           (it "Errors for a quoted lambda"
             (expect (open-link quoted-lambda-link)
-                    :to-throw 'wrong-type-argument '(characterp lambda)))
+                    :to-throw 'error '("CAUTION: Link not opened because unsafe title parameter detected: (lambda (_ _) (error \"UNSAFE\"))")))
           (it "Errors for an unquoted lambda"
             (expect (open-link unquoted-lambda-link)
-                    :to-throw 'wrong-type-argument '(characterp lambda)))
+                    :to-throw 'error '("CAUTION: Link not opened because unsafe title parameter detected: (lambda (_ _) (error \"UNSAFE\"))")))
           (it "Errors for an expression"
             (expect (open-link expression-link)
-                    :to-throw 'wrong-type-argument '(characterp error))))
+                    :to-throw 'error '("CAUTION: Link not opened because unsafe title parameter detected: (error \"UNSAFE\")"))))
 
         (describe "sort parameter"
           :var ((quoted-lambda-link "[[org-ql-search:todo:?sort%3D%28lambda%20%28_%20_%29%20%28error%20%22UNSAFE%22%29%29]]")