From 788951a4a9068b5ba14240fd25e4293a3712a716 Mon Sep 17 00:00:00 2001 From: Ahmed Shariff Date: Mon, 13 Sep 2021 11:01:55 -0500 Subject: [PATCH] Replacing org-ql-view--expand-buffers-files --- org-ql-view.el | 30 ++++++++++++------------------ 1 file changed, 12 insertions(+), 18 deletions(-) diff --git a/org-ql-view.el b/org-ql-view.el index 1faff2e..73a5416 100644 --- a/org-ql-view.el +++ b/org-ql-view.el @@ -1078,24 +1078,18 @@ representation `org-ql-view-buffers-files' is returned." (defun org-ql-view--expand-buffers-files (buffers-files) "Return BUFFERS-FILES expanded to a list of files or buffers. The counterpart to `org-ql-view--contract-buffers-files'." - (cl-labels - ((process-buffers-files-elements - (_buffers-files) - (pcase-exhaustive _buffers-files - ("all" (--select (equal (buffer-local-value 'major-mode it) 'org-mode) - (buffer-list))) - ("org-agenda-files" (org-agenda-files)) - ("org-directory" (org-ql-search-directories-files)) - ((or "" "buffer") (current-buffer)) - ((pred bufferp) (list _buffers-files)) - ((pred listp) (list _buffers-files)) - ;; A single filename. - ((pred stringp) (list _buffers-files))))) - (remove-duplicates (-mapcat #'process-buffers-files-elements - (remove nil (if (listp buffers-files) - buffers-files - (list buffer-files)))) - :test 'equalp))) + (--> (-list buffers-files) + (pcase-exhaustive it + ("all" (--select (equal (buffer-local-value 'major-mode it) 'org-mode) + (buffer-list))) + ("org-agenda-files" (org-agenda-files)) + ("org-directory" (org-ql-search-directories-files)) + ((or "" "buffer") (current-buffer)) + ((pred bufferp) (list it)) + ((pred listp) (list it)) + ;; A single filename. + ((pred stringp) (list it))) + -non-nil -uniq -flatten)) (defun org-ql-view--complete-super-groups () "Return value for `org-ql-view-super-groups' using completion."