branch: externals/dtache commit 72c563bc9605dc7ae345e179c4f027340482399e Author: Niklas Eklund <niklas.ekl...@posteo.net> Commit: Niklas Eklund <niklas.ekl...@posteo.net>
Fix indentation --- detached-compile.el | 4 +- detached-consult.el | 204 ++++++++++++++++++++++++++-------------------------- detached-extra.el | 12 ++-- detached-init.el | 18 ++--- 4 files changed, 120 insertions(+), 118 deletions(-) diff --git a/detached-compile.el b/detached-compile.el index 14a4fedad6..8d1fd6ae2a 100644 --- a/detached-compile.el +++ b/detached-compile.el @@ -56,7 +56,7 @@ Optionally enable COMINT if prefix-argument is provided." (let* ((detached-enabled t) (detached-session-origin (or detached-session-origin 'compile)) (detached-session-action (or detached-session-action - detached-compile-session-action)) + detached-compile-session-action)) (detached-session-mode 'create-and-attach)) (compile command comint))) @@ -121,7 +121,7 @@ Optionally EDIT-COMMAND." (detached-start-session command t) (cl-letf* ((name-function (lambda (_) buffer-name)) (detached--current-session (or detached--current-session - (detached-create-session command)))) + (detached-create-session command)))) (apply compilation-start `(,(detached-dtach-command detached--current-session t) ,(or mode 'detached-compilation-mode) ,name-function diff --git a/detached-consult.el b/detached-consult.el index 1e3860330a..0022163036 100644 --- a/detached-consult.el +++ b/detached-consult.el @@ -57,139 +57,139 @@ See `consult-multi' for a description of the source values." (defvar detached-consult--source-session `(:category detached - :annotate detached-session-annotation - :action (lambda (x) (detached-open-session (detached--decode-session x))) - :items - ,(lambda () - (mapcar #'car - (seq-remove - (lambda (x) - (seq-find (lambda (predicate) - (apply predicate `(,(cdr x)))) - detached-consult-hidden-predicates)) - (detached-session-candidates (detached-get-sessions)))))) + :annotate detached-session-annotation + :action (lambda (x) (detached-open-session (detached--decode-session x))) + :items + ,(lambda () + (mapcar #'car + (seq-remove + (lambda (x) + (seq-find (lambda (predicate) + (apply predicate `(,(cdr x)))) + detached-consult-hidden-predicates)) + (detached-session-candidates (detached-get-sessions)))))) "All `detached' sessions as a source for `consult'.") (defvar detached-consult--source-hidden-session `(:narrow (?\s . "Hidden") - :hidden t - :category detached - :annotate detached-session-annotation - :action (lambda (x) (detached-open-session (detached--decode-session x))) - :items - ,(lambda () - (mapcar #'car - (seq-filter - (lambda (x) - (seq-find (lambda (predicate) - (apply predicate `(,(cdr x)))) - detached-consult-hidden-predicates)) - (detached-session-candidates (detached-get-sessions)))))) + :hidden t + :category detached + :annotate detached-session-annotation + :action (lambda (x) (detached-open-session (detached--decode-session x))) + :items + ,(lambda () + (mapcar #'car + (seq-filter + (lambda (x) + (seq-find (lambda (predicate) + (apply predicate `(,(cdr x)))) + detached-consult-hidden-predicates)) + (detached-session-candidates (detached-get-sessions)))))) "Active `detached' sessions as a source for `consult'.") (defvar detached-consult--source-active-session `(:narrow (?a . "Active") - :hidden t - :category detached - :annotate detached-session-annotation - :action (lambda (x) (detached-open-session (detached--decode-session x))) - :items - ,(lambda () - (mapcar #'car - (seq-filter - (lambda (x) - (eq 'active (detached--session-state (cdr x)))) - (detached-session-candidates (detached-get-sessions)))))) + :hidden t + :category detached + :annotate detached-session-annotation + :action (lambda (x) (detached-open-session (detached--decode-session x))) + :items + ,(lambda () + (mapcar #'car + (seq-filter + (lambda (x) + (eq 'active (detached--session-state (cdr x)))) + (detached-session-candidates (detached-get-sessions)))))) "Active `detached' sessions as a source for `consult'.") (defvar detached-consult--source-inactive-session `(:narrow (?i . "Inactive") - :hidden t - :category detached - :annotate detached-session-annotation - :action (lambda (x) (detached-open-session (detached--decode-session x))) - :items - ,(lambda () - (mapcar #'car - (seq-filter - (lambda (x) - (eq 'inactive (detached--session-state (cdr x)))) - (detached-session-candidates (detached-get-sessions)))))) + :hidden t + :category detached + :annotate detached-session-annotation + :action (lambda (x) (detached-open-session (detached--decode-session x))) + :items + ,(lambda () + (mapcar #'car + (seq-filter + (lambda (x) + (eq 'inactive (detached--session-state (cdr x)))) + (detached-session-candidates (detached-get-sessions)))))) "Inactive `detached' sessions as a source for `consult'.") (defvar detached-consult--source-failure-session `(:narrow (?f . "Failure") - :hidden t - :category detached - :annotate detached-session-annotation - :action (lambda (x) (detached-open-session (detached--decode-session x))) - :items - ,(lambda () - (mapcar #'car - (seq-filter - (lambda (x) - (eq 'failure (car (detached--session-status (cdr x))))) - (detached-session-candidates (detached-get-sessions)))))) + :hidden t + :category detached + :annotate detached-session-annotation + :action (lambda (x) (detached-open-session (detached--decode-session x))) + :items + ,(lambda () + (mapcar #'car + (seq-filter + (lambda (x) + (eq 'failure (car (detached--session-status (cdr x))))) + (detached-session-candidates (detached-get-sessions)))))) "Failed `detached' sessions as a source for `consult'.") (defvar detached-consult--source-success-session `(:narrow (?s . "Success") - :hidden t - :category detached - :annotate detached-session-annotation - :action (lambda (x) (detached-open-session (detached--decode-session x))) - :items - ,(lambda () - (mapcar #'car - (seq-filter - (lambda (x) - (eq 'success (car (detached--session-status (cdr x))))) - (detached-session-candidates (detached-get-sessions)))))) + :hidden t + :category detached + :annotate detached-session-annotation + :action (lambda (x) (detached-open-session (detached--decode-session x))) + :items + ,(lambda () + (mapcar #'car + (seq-filter + (lambda (x) + (eq 'success (car (detached--session-status (cdr x))))) + (detached-session-candidates (detached-get-sessions)))))) "Successful `detached' sessions as a source for `consult'.") (defvar detached-consult--source-local-session `(:narrow (?l . "Local Host") - :hidden t - :category detached - :annotate detached-session-annotation - :action (lambda (x) (detached-open-session (detached--decode-session x))) - :items - ,(lambda () - (mapcar #'car - (seq-filter - (lambda (x) - (eq 'local (cdr (detached--session-host (cdr x))))) - (detached-session-candidates (detached-get-sessions))))) - "Local host `detached' sessions as a source for `consult'.")) + :hidden t + :category detached + :annotate detached-session-annotation + :action (lambda (x) (detached-open-session (detached--decode-session x))) + :items + ,(lambda () + (mapcar #'car + (seq-filter + (lambda (x) + (eq 'local (cdr (detached--session-host (cdr x))))) + (detached-session-candidates (detached-get-sessions))))) + "Local host `detached' sessions as a source for `consult'.")) (defvar detached-consult--source-remote-session `(:narrow (?r . "Remote Host") - :hidden t - :category detached - :annotate detached-session-annotation - :action (lambda (x) (detached-open-session (detached--decode-session x))) - :items - ,(lambda () - (mapcar #'car - (seq-filter - (lambda (x) - (eq 'remote (cdr (detached--session-host (cdr x))))) - (detached-session-candidates (detached-get-sessions)))))) + :hidden t + :category detached + :annotate detached-session-annotation + :action (lambda (x) (detached-open-session (detached--decode-session x))) + :items + ,(lambda () + (mapcar #'car + (seq-filter + (lambda (x) + (eq 'remote (cdr (detached--session-host (cdr x))))) + (detached-session-candidates (detached-get-sessions)))))) "Remote host `detached' sessions as a source for `consult'.") (defvar detached-consult--source-current-session `(:narrow (?c . "Current Host") - :hidden t - :category detached - :annotate detached-session-annotation - :action (lambda (x) (detached-open-session (detached--decode-session x))) - :items - ,(lambda () - (let ((host-name (car (detached--host)))) - (mapcar #'car (seq-filter - (lambda (x) - (string= (car (detached--session-host (cdr x))) host-name)) - (detached-session-candidates (detached-get-sessions))))))) + :hidden t + :category detached + :annotate detached-session-annotation + :action (lambda (x) (detached-open-session (detached--decode-session x))) + :items + ,(lambda () + (let ((host-name (car (detached--host)))) + (mapcar #'car (seq-filter + (lambda (x) + (string= (car (detached--session-host (cdr x))) host-name)) + (detached-session-candidates (detached-get-sessions))))))) "Current host `detached' sessions as a source for `consult'.") ;;;; Commands diff --git a/detached-extra.el b/detached-extra.el index 6b4d2079ef..a9f8867592 100644 --- a/detached-extra.el +++ b/detached-extra.el @@ -35,7 +35,9 @@ ;;;###autoload (defun detached-extra-projectile-run-compilation (cmd &optional use-comint-mode) - "If CMD is a string execute it with `detached-compile', optionally USE-COMINT-MODE." + "If CMD is a string execute it with `detached-compile'. + +Optionally USE-COMINT-MODE" (if (functionp cmd) (funcall cmd) (let ((detached-session-origin 'projectile)) @@ -43,10 +45,10 @@ ;;;###autoload (defun detached-extra-dired-rsync (command _details) - "Run COMMAND with `detached'." - (let ((detached-local-session t) - (detached-session-origin 'rsync)) - (detached-start-session command t))) + "Run COMMAND with `detached'." + (let ((detached-local-session t) + (detached-session-origin 'rsync)) + (detached-start-session command t))) (provide 'detached-extra) diff --git a/detached-init.el b/detached-init.el index e36d92907a..b6bcda7543 100644 --- a/detached-init.el +++ b/detached-init.el @@ -90,14 +90,14 @@ ;;;; Support functions (defvar detached-init--package-integration '((compile . detached-init-compile) - (dired . detached-init-dired) - (dired-rsync . detached-init-dired-rsync) - (embark . detached-init-embark) - (eshell . detached-init-eshell) - (org . detached-init-org) - (projectile . detached-init-projectile) - (shell . detached-init-shell) - (vterm . detached-init-vterm)) + (dired . detached-init-dired) + (dired-rsync . detached-init-dired-rsync) + (embark . detached-init-embark) + (eshell . detached-init-eshell) + (org . detached-init-org) + (projectile . detached-init-projectile) + (shell . detached-init-shell) + (vterm . detached-init-vterm)) "Alist which contain names of packages and their initialization function.") ;;;; Functions @@ -117,7 +117,7 @@ (member (car it) detached-init-block-list))) (seq-map #'cdr)))) (dolist (init-function init-functions) - (funcall init-function)))) + (funcall init-function)))) (defun detached-init-shell () "Initialize integration with `shell'."