update packages

lisp/treemacs/treemacs-pkg.el

@@ -1,5 +1,5 @@
 ;; -*- no-byte-compile: t; lexical-binding: nil -*-
-(define-package "treemacs" "20250617.1934"
+(define-package "treemacs" "20250707.2001"
   "A tree style file explorer package."
   '((emacs      "26.1")
     (cl-lib     "0.5")
@@ -11,7 +11,7 @@
     (ht         "2.2")
     (cfrs       "1.3.2"))
   :url "https://github.com/Alexander-Miller/treemacs"
-  :commit "7109ce99853b18435a77267a15c5dd06715b54e4"
-  :revdesc "7109ce99853b"
+  :commit "246d9505edf86c25a08cfbd131c441c8d402f8c3"
+  :revdesc "246d9505edf8"
   :authors '(("Alexander Miller" . "alexanderm@web.de"))
   :maintainers '(("Alexander Miller" . "alexanderm@web.de")))

lisp/treemacs/treemacs-workspaces.el

@@ -139,16 +139,17 @@ If no workspace is assigned to the current scope the persisted workspaces will
 be loaded and a workspace will be found based on the `current-buffer'.
 
 This function can be used with `setf'."
+  (treemacs--maybe-load-workspaces)
   (or treemacs-override-workspace
-      (-if-let (shelf (treemacs-current-scope-shelf))
-          (treemacs-scope-shelf->workspace shelf)
-        (treemacs--maybe-load-workspaces)
-        (let* ((workspace (treemacs--find-workspace (buffer-file-name (current-buffer))))
-               (new-shelf (treemacs-scope-shelf->create! :workspace workspace)))
-          (setf (treemacs-current-scope-shelf) new-shelf)
-          (run-hook-with-args treemacs-workspace-first-found-functions
-                              workspace (treemacs-current-scope))
-          workspace))))
+      (let* ((shelf (treemacs-current-scope-shelf))
+             (workspace (and shelf (treemacs-scope-shelf->workspace shelf))))
+        (or workspace
+            (let* ((workspace (treemacs--find-workspace (buffer-file-name (current-buffer))))
+                   (new-shelf (treemacs-scope-shelf->create! :workspace workspace)))
+              (setf (treemacs-current-scope-shelf) new-shelf)
+              (run-hook-with-args treemacs-workspace-first-found-functions
+                                  workspace (treemacs-current-scope))
+              workspace)))))
 
 (gv-define-setter treemacs-current-workspace (val)
   `(let ((shelf (treemacs-current-scope-shelf)))

lisp/treemacs/treemacs.el

@@ -5,8 +5,8 @@
 ;; Author: Alexander Miller <alexanderm@web.de>
 ;; Package-Requires: ((emacs "26.1") (cl-lib "0.5") (dash "2.11.0") (s "1.12.0") (ace-window "0.9.0") (pfuture "1.7") (hydra "0.13.2") (ht "2.2") (cfrs "1.3.2"))
 ;; Homepage: https://github.com/Alexander-Miller/treemacs
-;; Package-Version: 20250617.1934
-;; Package-Revision: 7109ce99853b
+;; Package-Version: 20250707.2001
+;; Package-Revision: 246d9505edf8
 
 ;; This program is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by