From: João Távora <joaotavora@gmail.com>
Date: Thu, 16 Mar 2023 14:05:42 +0000 (+0000)
Subject: Also exempt eglot-inlay-hints-mode from desktop.el's fumblings
X-Git-Tag: emacs-29.0.90~165
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=7385c991dff3466b37cf50628e7685cd53e71921;p=emacs.git

Also exempt eglot-inlay-hints-mode from desktop.el's fumblings

Reported in https://github.com/joaotavora/eglot/discussions/1183.

* lisp/progmodes/eglot.el (desktop): Also exempt
eglot-inlay-hints-mode from desktop.el fumblings.
---

diff --git a/lisp/progmodes/eglot.el b/lisp/progmodes/eglot.el
index 5c61a444fd3..52bba717a67 100644
--- a/lisp/progmodes/eglot.el
+++ b/lisp/progmodes/eglot.el
@@ -3654,13 +3654,11 @@ If NOERROR, return predicate, else erroring function."
 
 ;;; Hacks
 ;;;
-;; FIXME: Although desktop.el compatibility is Emacs bug#56407, the
-;; optimal solution agreed to there is a bit more work than what I
-;; have time to right now.  See
-;; e.g. https://debbugs.gnu.org/cgi/bugreport.cgi?bug=bug%2356407#68.
-;; For now, just use `with-eval-after-load'
+;; Emacs bug#56407, the optimal solution is in desktop.el, but that's
+;; harder. For now, use `with-eval-after-load'. See also github#1183.
 (with-eval-after-load 'desktop
-  (add-to-list 'desktop-minor-mode-handlers '(eglot--managed-mode . ignore)))
+  (add-to-list 'desktop-minor-mode-handlers '(eglot--managed-mode . ignore))
+  (add-to-list 'desktop-minor-mode-handlers '(eglot-inlay-hints-mode . ignore)))
 
 
 ;;; Misc