jiri/org-ql
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Using completing-read-multiple for org-ql-view--complete-buffers-files

Browse source
This commit is contained in:
Ahmed Shariff 2021-07-18 23:49:54 -05:00
parent 06bdfc7a9e
commit b68d836562
1 changed files with 26 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

42
org-ql-view.el
View file

@ -1060,11 +1060,14 @@ representation `org-ql-view-buffers-files' is returned."
(when org-ql-view-buffers-files (when org-ql-view-buffers-files
(org-ql-view--contract-buffers-files (org-ql-view--contract-buffers-files
org-ql-view-buffers-files))) org-ql-view-buffers-files)))
(initial-input (if (or (not contracted-org-ql-view-buffers-files) ;; not nil (initial-input (pcase contracted-org-ql-view-buffers-files
(stringp contracted-org-ql-view-buffers-files)) ('nil nil)
contracted-org-ql-view-buffers-files ('string contracted-org-ql-view-buffers-files)
(format "%s" contracted-org-ql-view-buffers-files))) ((pred listp)
(completion-read-result (completing-read (mapconcat 'identity contracted-org-ql-view-buffers-files
","))
(_ (format "%s" contracted-org-ql-view-buffers-files))))
(completion-read-result (completing-read-multiple
"Buffers/Files: " "Buffers/Files: "
(list 'buffer 'org-agenda-files 'org-directory 'all) (list 'buffer 'org-agenda-files 'org-directory 'all)
nil nil initial-input))) nil nil initial-input)))
@ -1075,17 +1078,24 @@ representation `org-ql-view-buffers-files' is returned."
(defun org-ql-view--expand-buffers-files (buffers-files) (defun org-ql-view--expand-buffers-files (buffers-files)
"Return BUFFERS-FILES expanded to a list of files or buffers. "Return BUFFERS-FILES expanded to a list of files or buffers.
The counterpart to `org-ql-view--contract-buffers-files'." The counterpart to `org-ql-view--contract-buffers-files'."
(pcase-exhaustive buffers-files (cl-labels
("all" (--select (equal (buffer-local-value 'major-mode it) 'org-mode) ((process-buffers-files-elements
(buffer-list))) (_buffers-files)
("org-agenda-files" (org-agenda-files)) (pcase-exhaustive _buffers-files
("org-directory" (org-ql-search-directories-files)) ("all" (--select (equal (buffer-local-value 'major-mode it) 'org-mode)
((or "" "buffer") (current-buffer)) (buffer-list)))
((pred bufferp) buffers-files) ("org-agenda-files" (org-agenda-files))
((pred listp) buffers-files) ("org-directory" (org-ql-search-directories-files))
;; A single filename. ((or "" "buffer") (current-buffer))
((pred stringp) buffers-files))) ((pred bufferp) (list _buffers-files))
((pred listp) (list _buffers-files))
;; A single filename.
((pred stringp) (list _buffers-files)))))
(-mapcat #'process-buffers-files-elements
(remove nil (if (listp buffers-files)
buffers-files
(list buffer-files))))))
(defun org-ql-view--complete-super-groups () (defun org-ql-view--complete-super-groups ()
"Return value for `org-ql-view-super-groups' using completion." "Return value for `org-ql-view-super-groups' using completion."
(when (bound-and-true-p org-super-agenda-auto-selector-keywords) (when (bound-and-true-p org-super-agenda-auto-selector-keywords)