update packages

lisp/treemacs/treemacs-compatibility.el

@@ -16,8 +16,9 @@
 ;; along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
-;;; Simple bits of code to make treemacs compatible with other packages
-;;; that aren't worth the effort of being turned into their own package.
+
+;; Simple bits of code to make treemacs compatible with other packages
+;; that aren't worth the effort of being turned into their own package.
 
 ;;; Code:
 
@@ -36,6 +37,30 @@
  (push '(treemacs-id . :never) frameset-filter-alist)
  (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)))))
+
+(with-eval-after-load 'recentf
+  (with-no-warnings
+    (add-to-list 'recentf-exclude treemacs-persist-file)
+    (add-to-list 'recentf-exclude treemacs-last-error-persist-file)))
+
+(with-eval-after-load 'eyebrowse
+
+  (defun treemacs--follow-after-eyebrowse-switch ()
+    (when treemacs-follow-mode
+      (--when-let (treemacs-get-local-window)
+        (with-selected-window it
+          (treemacs--follow-after-buffer-list-update)
+          (hl-line-highlight)))))
+
+  (declare-function treemacs--follow-after-eyebrowse-switch "treemacs-compatibility")
+
+  (add-hook 'eyebrowse-post-window-switch-hook #'treemacs--follow-after-eyebrowse-switch))
+
 (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)))))
@@ -52,6 +77,16 @@
   (when (boundp 'indent-guide-inhibit-modes)
     (push 'treemacs-mode indent-guide-inhibit-modes)))
 
+(with-eval-after-load 'ediff
+  (add-hook
+   'ediff-before-setup-hook
+   (defun treemacs--dont-diff-in-treemacs-window ()
+     "Select `next-window' before ediff's window setup.
+Treemacs is by default a side-window, meaning it'll throw an error if ediff trys
+to split it."
+     (when treemacs--in-this-buffer
+       (select-window (next-window))))))
+
 (with-eval-after-load 'persp-mode
   (defun treemacs--remove-treemacs-window-in-new-frames (persp-activated-for)
     (when (eq persp-activated-for 'frame)