Tidy, rename

This commit is contained in:
Adam Porter 2023-12-21 16:35:25 -06:00
parent 0552aa8b93
commit 2644f53fe2

View file

@ -26,6 +26,12 @@
(require 'org-ql) (require 'org-ql)
;;;; Variables
(defvar-keymap org-ql-completing-read-map
:doc "Active during `org-ql-completing-read' sessions."
(kbd "C-c C-e") #'org-ql-completing-read-export)
;;;; Customization ;;;; Customization
(defgroup org-ql-completing-read nil (defgroup org-ql-completing-read nil
@ -114,16 +120,10 @@ value, or nil."
;;;;; Completing read ;;;;; Completing read
(defun org-ql-export-view () (defun org-ql-completing-read-export ()
"Create `org-ql-view' buffer from current minibuffer org-ql search." "Show `org-ql-view' buffer for current `org-ql-completing-read'-based search."
(interactive) (interactive)
(user-error "Must be run from within an `org-ql-completing-read' session")) (user-error "Not in an `org-ql-completing-read' session"))
(defvar org-ql-completing-read-map
(let ((map (make-sparse-keymap)))
(define-key map (kbd "C-c C-e") #'org-ql-export-view)
map)
"Keymap active during `org-ql-completing-read' minibuffer sessions.")
;;;###autoload ;;;###autoload
(cl-defun org-ql-completing-read (cl-defun org-ql-completing-read
@ -337,7 +337,7 @@ single predicate)."
(minibuffer-with-setup-hook (minibuffer-with-setup-hook
(lambda () (lambda ()
(use-local-map (make-composed-keymap org-ql-completing-read-map (current-local-map)))) (use-local-map (make-composed-keymap org-ql-completing-read-map (current-local-map))))
(cl-letf* (((symbol-function 'org-ql-export-view) (cl-letf* (((symbol-function 'org-ql-completing-read-export)
(lambda () (lambda ()
(interactive) (interactive)
(run-at-time 0 nil (run-at-time 0 nil
@ -348,7 +348,7 @@ single predicate)."
(minibuffer-quit-recursive-edit) (minibuffer-quit-recursive-edit)
(abort-recursive-edit)))) (abort-recursive-edit))))
((symbol-function 'embark-export) ((symbol-function 'embark-export)
(symbol-function 'org-ql-export-view))) (symbol-function 'org-ql-completing-read-export)))
(completing-read prompt #'collection nil t))))) (completing-read prompt #'collection nil t)))))
;; (debug-message "SELECTED:%S KEYS:%S" selected (hash-table-keys table)) ;; (debug-message "SELECTED:%S KEYS:%S" selected (hash-table-keys table))
(or (gethash selected table) (or (gethash selected table)