Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions org-ql-completing-read.el
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ value, or nil."

;;;###autoload
(cl-defun org-ql-completing-read
(buffers-files &key query-prefix query-filter narrowp
(buffers-files &key query-prefix query-filter narrowp initial-input
(action #'org-ql-completing-read-action)
;; FIXME: Unused argument.
;; (annotate #'org-ql-completing-read-snippet)
Expand All @@ -156,7 +156,9 @@ QUERY-FILTER may be a function through which the query the user
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)."
single predicate).

INITIAL-INPUT may be a string to initially be filled in the query."
(declare (indent defun))
;; Emacs's completion API is not always easy to understand, especially when using "programmed
;; completion." This code was made possible by the example Clemens Radermacher shared at
Expand Down Expand Up @@ -351,7 +353,7 @@ single predicate)."
(abort-recursive-edit))))
((symbol-function 'embark-export)
(symbol-function 'org-ql-completing-read-export)))
(completing-read prompt #'collection nil t)))))
(completing-read prompt #'collection nil t initial-input)))))
;; (debug-message "SELECTED:%S KEYS:%S" selected (hash-table-keys table))
(or (gethash selected table)
;; If there are completions in the table, but none of them exactly match the user input
Expand Down
7 changes: 5 additions & 2 deletions org-ql-find.el
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ See function `display-buffer'."

;;;###autoload
(cl-defun org-ql-find (buffers-files &key query-prefix query-filter widen
(prompt "Find entry: "))
initial-input (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
Expand All @@ -75,7 +75,9 @@ QUERY-FILTER may be a function through which the query the user
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)."
single predicate).

INITIAL-INPUT may be a string to initially be filled in the query."
(interactive (list (org-ql-find--buffers
:read-buffer-p (equal '(16) current-prefix-arg))
:widen current-prefix-arg))
Expand All @@ -86,6 +88,7 @@ single predicate)."
:narrowp (not widen)
:query-prefix query-prefix
:query-filter query-filter
:initial-input initial-input
:prompt prompt))))
(set-buffer (or (buffer-base-buffer (marker-buffer marker))
(marker-buffer marker)))
Expand Down
2 changes: 1 addition & 1 deletion org-ql-search.el
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,7 @@ 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)
(when-let* ((from (pcase org-agenda-restrict
Expand Down