]> git.eshelyaron.com Git - emacs.git/commitdiff
Also exempt eglot-inlay-hints-mode from desktop.el's fumblings
authorJoão Távora <joaotavora@gmail.com>
Thu, 16 Mar 2023 14:05:42 +0000 (14:05 +0000)
committerJoão Távora <joaotavora@gmail.com>
Thu, 16 Mar 2023 14:09:00 +0000 (14:09 +0000)
Reported in https://github.com/joaotavora/eglot/discussions/1183.

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

lisp/progmodes/eglot.el

index 5c61a444fd3bd09f21242a555da3c830c364a813..52bba717a67ca238df4f8d96e641a8c624f96c2f 100644 (file)
@@ -3654,13 +3654,11 @@ If NOERROR, return predicate, else erroring function."
 \f
 ;;; 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)))
 
 \f
 ;;; Misc