update packages

lisp/treemacs/treemacs-compatibility.el

@@ -1,6 +1,6 @@
 ;;; treemacs.el --- A tree style file viewer package -*- lexical-binding: t -*-
 
-;; Copyright (C) 2023 Alexander Miller
+;; Copyright (C) 2024 Alexander Miller
 
 ;; 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
@@ -28,6 +28,7 @@
 (require 'treemacs-scope)
 (require 'treemacs-core-utils)
 (require 'treemacs-interface)
+(require 'treemacs-persistence)
 
 (eval-when-compile
   (require 'treemacs-macros))
@@ -38,10 +39,13 @@
  (push '(treemacs-workspace . :never) frameset-filter-alist))
 
 (with-eval-after-load 'tramp
-  (setf treemacs--file-name-handler-alist
-        (with-no-warnings
-          (list
-           (cons tramp-file-name-regexp #'tramp-file-name-handler)))))
+  (setf
+   treemacs--no-abbr-on-persist-prefixes
+   (--map (format "/%s:" (car it)) (with-no-warnings tramp-methods))
+   treemacs--file-name-handler-alist
+   (with-no-warnings
+     (list
+      (cons tramp-file-name-regexp #'tramp-file-name-handler)))))
 
 (with-eval-after-load 'recentf
   (with-no-warnings
@@ -61,6 +65,22 @@
 
   (add-hook 'eyebrowse-post-window-switch-hook #'treemacs--follow-after-eyebrowse-switch))
 
+(with-eval-after-load 'windmove
+  (defun treemacs--windmove-swap-state-advice (original-fn &rest args)
+    "Advice for windmove-swap-state-* functions to ignore treemacs.
+These commands do not seem to be compatible with side windows (and thus treemacs
+in its default configuration), so this advice changes them to do nothing when
+the `selected-window' is treemacs.
+
+For all other cases ORIGINAL-FN is called with original ARGS."
+    (unless (and treemacs-display-in-side-window
+                 (treemacs-is-treemacs-window-selected?))
+      (apply original-fn args)))
+
+  (with-no-warnings
+    (advice-add 'windmove-swap-states-in-direction
+                :around #'treemacs--windmove-swap-state-advice)))
+
 (with-eval-after-load 'winum
   (when (boundp 'winum-ignored-buffers-regexp)
     (add-to-list 'winum-ignored-buffers-regexp (regexp-quote (format "%sScoped-Buffer-" treemacs--buffer-name-prefix)))))
@@ -142,11 +162,6 @@ width of the new window when the treemacs window is visible."
         (org-link-set-parameters "treemacs" :store #'treemacs-store-org-link)
       (add-hook 'org-store-link-functions #'treemacs-store-org-link))))
 
-(with-eval-after-load 'evil-escape
-  ;; Disable old versions of evil-escape but keep newer versions active
-  (when (and (boundp 'evil-escape-excluded-major-modes) (not (boundp 'evil-escape-version)))
-    (add-to-list 'evil-escape-excluded-major-modes 'treemacs-mode)))
-
 (when (fboundp 'context-menu-mode)
   (defun treemacs--disable-context-menu-mode ()
     (treemacs-run-in-all-derived-buffers