diff --git a/modules/app/calendar/autoload.el b/modules/app/calendar/autoload.el index 3dc9efb1e..155d04f5b 100644 --- a/modules/app/calendar/autoload.el +++ b/modules/app/calendar/autoload.el @@ -36,7 +36,7 @@ (interactive) (if (modulep! :ui workspaces) (when (+workspace-exists-p +calendar-workspace-name) - (+workspace/delete +calendar-workspace-name)) + (+workspace/kill +calendar-workspace-name)) (when (window-configuration-p +calendar--wconf) (set-window-configuration +calendar--wconf)) (setq +calendar--wconf nil)) diff --git a/modules/app/irc/autoload/irc.el b/modules/app/irc/autoload/irc.el index 16bca925b..bba6d1e3e 100644 --- a/modules/app/irc/autoload/irc.el +++ b/modules/app/irc/autoload/irc.el @@ -60,7 +60,7 @@ workspace for it." (mapc #'kill-buffer (doom-buffers-in-mode 'circe-mode (buffer-list) t)) (when (modulep! :ui workspaces) (when (equal (+workspace-current-name) +irc--workspace-name) - (+workspace/delete +irc--workspace-name))))) + (+workspace/kill +irc--workspace-name))))) ;;;###autoload (defun +irc/jump-to-channel (&optional this-server) diff --git a/modules/app/rss/autoload.el b/modules/app/rss/autoload.el index 0a651b68c..c1717afdb 100644 --- a/modules/app/rss/autoload.el +++ b/modules/app/rss/autoload.el @@ -109,7 +109,7 @@ (mapc #'kill-buffer show-buffers)) (if (and (modulep! :ui workspaces) (+workspace-exists-p +rss-workspace-name)) - (+workspace/delete +rss-workspace-name) + (+workspace/kill +rss-workspace-name) (when (window-configuration-p +rss--wconf) (set-window-configuration +rss--wconf)) (setq +rss--wconf nil) diff --git a/modules/config/default/+emacs-bindings.el b/modules/config/default/+emacs-bindings.el index 18f45574f..1b0394eea 100644 --- a/modules/config/default/+emacs-bindings.el +++ b/modules/config/default/+emacs-bindings.el @@ -412,7 +412,7 @@ :desc "Rename workspace" "r" #'+workspace/rename :desc "Create workspace" "c" #'+workspace/new :desc "Create named workspace" "C" #'+workspace/new-named - :desc "Delete workspace" "k" #'+workspace/delete + :desc "Delete workspace" "k" #'+workspace/kill :desc "Save workspace" "S" #'+workspace/save :desc "Switch to other workspace" "o" #'+workspace/other :desc "Switch to left workspace" "p" #'+workspace/switch-left diff --git a/modules/config/default/+evil-bindings.el b/modules/config/default/+evil-bindings.el index 56f847c18..08b00882c 100644 --- a/modules/config/default/+evil-bindings.el +++ b/modules/config/default/+evil-bindings.el @@ -379,8 +379,8 @@ :desc "New named workspace" "N" #'+workspace/new-named :desc "Load workspace from file" "l" #'+workspace/load :desc "Save workspace to file" "s" #'+workspace/save - :desc "Delete session" "x" #'+workspace/kill-session - :desc "Delete this workspace" "d" #'+workspace/delete + :desc "Kill session" "x" #'+workspace/kill-session + :desc "Kill this workspace" "d" #'+workspace/kill :desc "Rename workspace" "r" #'+workspace/rename :desc "Restore last session" "R" #'+workspace/restore-last-session :desc "Next workspace" "]" #'+workspace/switch-right diff --git a/modules/email/mu4e/autoload/email.el b/modules/email/mu4e/autoload/email.el index f9efcbf74..9fe270bd0 100644 --- a/modules/email/mu4e/autoload/email.el +++ b/modules/email/mu4e/autoload/email.el @@ -365,7 +365,7 @@ When otherwise called, open a dired buffer and enable `dired-mu4e-attach-ctrl-c- ;; (prolusion-mail-hide) (cond ((and (modulep! :ui workspaces) (+workspace-exists-p +mu4e-workspace-name)) - (+workspace/delete +mu4e-workspace-name)) + (+workspace/kill +mu4e-workspace-name)) (+mu4e--old-wconf (set-window-configuration +mu4e--old-wconf) diff --git a/modules/email/notmuch/autoload.el b/modules/email/notmuch/autoload.el index dfebce7fa..b7a27834d 100644 --- a/modules/email/notmuch/autoload.el +++ b/modules/email/notmuch/autoload.el @@ -32,7 +32,7 @@ ;; (+popup/close (get-buffer-window "*notmuch-hello*")) (doom-kill-matching-buffers "^\\*notmuch") (when (modulep! :ui workspaces) - (+workspace/delete +notmuch-workspace-name))) + (+workspace/kill +notmuch-workspace-name))) (defun +notmuch-get-sync-command () "Return a shell command string to synchronize your notmuch mail with." diff --git a/modules/ui/workspaces/README.org b/modules/ui/workspaces/README.org index d99f4ea1b..d15137fd5 100644 --- a/modules/ui/workspaces/README.org +++ b/modules/ui/workspaces/README.org @@ -86,7 +86,7 @@ in [[../../editor/evil/+commands.el][config/default/+evil-commands.el]]). | ~+workspace/other~ | [[kbd:][SPC TAB `]] | Switch to last workspace | | ~+workspace/switch-left~ | [[kbd:][SPC TAB []] / [[kbd:][[ w]] / [[kbd:][gT]] | Switch to previous workspace | | ~+workspace/switch-right~ | [[kbd:][SPC TAB ]]] / [[kbd:][] w]] / [[kbd:][gt]] | Switch to next workspace | -| ~+workspace/delete~ | [[kbd:][SPC TAB d]] | Delete the current workspace | +| ~+workspace/kill~ | [[kbd:][SPC TAB d]] | Delete the current workspace | | ~+workspace/kill-session~ | [[kbd:][SPC TAB x]] / [[kbd:][:sclear]] | Clears the current session (kills all windows and buffers) | * TODO Configuration @@ -120,6 +120,6 @@ in [[../../editor/evil/+commands.el][config/default/+evil-commands.el]]). + ~+workspace-save-session NAME~ + ~+workspace-new NAME~ + ~+workspace-rename NAME NEW-NAME~ -+ ~+workspace-delete NAME &optional INHIBIT-KILL-P~ ++ ~+workspace-kill NAME &optional INHIBIT-KILL-P~ + ~+workspace-switch NAME &optional AUTO-CREATE-P~ + ~+workspace-protected-p NAME~ -> bool diff --git a/modules/ui/workspaces/autoload/evil.el b/modules/ui/workspaces/autoload/evil.el index 32e559d5a..bb904e540 100644 --- a/modules/ui/workspaces/autoload/evil.el +++ b/modules/ui/workspaces/autoload/evil.el @@ -23,8 +23,8 @@ ;;;###autoload (autoload '+workspace:delete "ui/workspaces/autoload/evil" nil t) (evil-define-command +workspace:delete () - "Ex wrapper around `+workspace/delete'." - (interactive) (+workspace/delete (+workspace-current-name))) + "Ex wrapper around `+workspace/kill'." + (interactive) (+workspace/kill (+workspace-current-name))) ;;;###autoload (autoload '+workspace:switch-next "ui/workspaces/autoload/evil" nil t) (evil-define-command +workspace:switch-next (&optional count) diff --git a/modules/ui/workspaces/autoload/workspaces.el b/modules/ui/workspaces/autoload/workspaces.el index 4cca0c7a8..d83c9d5da 100644 --- a/modules/ui/workspaces/autoload/workspaces.el +++ b/modules/ui/workspaces/autoload/workspaces.el @@ -150,10 +150,10 @@ success, nil otherwise." (persp-rename new-name (+workspace-get name))) ;;;###autoload -(defun +workspace-delete (workspace &optional inhibit-kill-p) - "Delete the workspace denoted by WORKSPACE, which can be the name of a perspective -or its hash table. If INHIBIT-KILL-P is non-nil, don't kill this workspace's -buffers." +(defun +workspace-kill (workspace &optional inhibit-kill-p) + "Kill the workspace denoted by WORKSPACE, which can be the name of a +perspective or its hash table. If INHIBIT-KILL-P is non-nil, don't kill this +workspace's buffers." (unless (stringp workspace) (setq workspace (persp-name workspace))) (when (+workspace--protected-p workspace) @@ -231,14 +231,14 @@ workspace." ('error (+workspace-error ex t)))) ;;;###autoload -(defun +workspace/delete (name) +(defun +workspace/kill (name) "Delete this workspace. If called with C-u, prompts you for the name of the workspace to delete." (interactive (let ((current-name (+workspace-current-name))) (list (if current-prefix-arg - (completing-read (format "Delete workspace (default: %s): " current-name) + (completing-read (format "Kill workspace (default: %s): " current-name) (+workspace-list-names) nil nil nil nil current-name) current-name)))) @@ -250,9 +250,9 @@ workspace to delete." (cond ((delq (selected-frame) (persp-frames-with-persp (get-frame-persp))) (user-error "Can't close workspace, it's visible in another frame")) ((not (equal (+workspace-current-name) name)) - (+workspace-delete name)) + (+workspace-kill name)) ((cdr workspaces) - (+workspace-delete name) + (+workspace-kill name) (+workspace-switch (if (+workspace-exists-p +workspace--last) +workspace--last @@ -262,7 +262,7 @@ workspace to delete." (t (+workspace-switch +workspaces-main t) (unless (string= (car workspaces) +workspaces-main) - (+workspace-delete name)) + (+workspace-kill name)) (doom/kill-all-buffers (doom-buffer-list)))) (+workspace-message (format "Deleted '%s' workspace" name) 'success))) ('error (+workspace-error ex t)))) @@ -275,7 +275,7 @@ workspace to delete." (persps (length (+workspace-list-names))) (buffers 0)) (let ((persp-autokill-buffer-on-remove t)) - (unless (cl-every #'+workspace-delete (+workspace-list-names)) + (unless (cl-every #'+workspace-kill (+workspace-list-names)) (+workspace-error "Could not clear session"))) (+workspace-switch +workspaces-main t) (setq buffers (doom/kill-all-buffers (buffer-list))) @@ -401,7 +401,7 @@ the next." (let ((frame-persp (frame-parameter nil 'workspace))) (if (string= frame-persp (+workspace-current-name)) (delete-frame) - (+workspace/delete current-persp-name)))) + (+workspace/kill current-persp-name)))) ((+workspace-error "Can't delete last workspace" t))))))) @@ -490,7 +490,7 @@ created." (setq frame (selected-frame))) (let ((frame-persp (frame-parameter frame 'workspace))) (when (string= frame-persp (+workspace-current-name)) - (+workspace/delete frame-persp))))) + (+workspace/kill frame-persp))))) ;;;###autoload (defun +workspaces-associate-frame-fn (frame &optional _new-frame-p)