From 1a068f82f1b0a74f541d78aeecf3c5fd97eddfce Mon Sep 17 00:00:00 2001
From: Henrik Lissner <henrik@lissner.net>
Date: Sat, 7 Jul 2018 11:41:24 +0200
Subject: [PATCH] Add +workspace/load-last-session

And fix the load last session button on dashboard.
---
 modules/config/default/+bindings.el               | 4 ++--
 modules/feature/workspaces/autoload/workspaces.el | 6 ++++++
 modules/ui/doom-dashboard/config.el               | 2 +-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/modules/config/default/+bindings.el b/modules/config/default/+bindings.el
index 3181eaad3..f455055f9 100644
--- a/modules/config/default/+bindings.el
+++ b/modules/config/default/+bindings.el
@@ -530,7 +530,7 @@
         :desc "Display tab bar"          :n [tab] #'+workspace/display
         :desc "New workspace"            :n "n"   #'+workspace/new
         :desc "Load workspace from file" :n "l"   #'+workspace/load
-        :desc "Load last session"        :n "L"   #'+workspace/load-session
+        :desc "Load a past session"      :n "L"   #'+workspace/load-session
         :desc "Save workspace to file"   :n "s"   #'+workspace/save
         :desc "Autosave current session" :n "S"   #'+workspace/save-session
         :desc "Switch workspace"         :n "."   #'+workspace/switch-to
@@ -538,7 +538,7 @@
         :desc "Delete session"           :n "X"   #'+workspace/kill-session
         :desc "Delete this workspace"    :n "d"   #'+workspace/delete
         :desc "Rename workspace"         :n "r"   #'+workspace/rename
-        :desc "Restore last session"     :n "R"   (λ! (+workspace/load-session))
+        :desc "Restore last session"     :n "R"   #'+workspace/load-last-session
         :desc "Next workspace"           :n "]"   #'+workspace/switch-right
         :desc "Previous workspace"       :n "["   #'+workspace/switch-left
         :desc "Switch to 1st workspace"  :n "1"   (λ! (+workspace/switch-to 0))
diff --git a/modules/feature/workspaces/autoload/workspaces.el b/modules/feature/workspaces/autoload/workspaces.el
index 3766f02c5..0c9cb9512 100644
--- a/modules/feature/workspaces/autoload/workspaces.el
+++ b/modules/feature/workspaces/autoload/workspaces.el
@@ -248,6 +248,12 @@ session."
         (+workspace-message (format "'%s' workspace loaded" name) 'success))
     '(error (+workspace-error (cadr ex) t))))
 
+;;;###autoload
+(defun +workspace/load-last-session ()
+  "Restore last session and switch to it."
+  (interactive)
+  (+workspace/load-session))
+
 ;;;###autoload
 (defun +workspace/save-session (&optional name)
   "Save the current session. If called with C-u, prompt you for the name to save
diff --git a/modules/ui/doom-dashboard/config.el b/modules/ui/doom-dashboard/config.el
index cf687773b..4dad0c44c 100644
--- a/modules/ui/doom-dashboard/config.el
+++ b/modules/ui/doom-dashboard/config.el
@@ -46,7 +46,7 @@ Possible values:
                 (file-exists-p (expand-file-name persp-auto-save-fname
                                                  persp-save-dir)))
      :face (:inherit (font-lock-keyword-face bold))
-     :action +workspace/load-session)
+     :action +workspace/load-last-session)
     ("See agenda for this week"
      :icon (all-the-icons-octicon "calendar" :face 'font-lock-keyword-face)
      :when (fboundp 'org-agenda-list)