From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Stefan Monnier via "Bug reports for GNU Emacs, the Swiss army knife of text editors" Newsgroups: gmane.emacs.bugs Subject: bug#70927: Acknowledgement (30.0.50; track-changes assertion when shutting down eglot) Date: Wed, 15 May 2024 14:49:59 -0400 Message-ID: References: <871q65xsi6.fsf@stebalien.com> <87y18dwdri.fsf@stebalien.com> Reply-To: Stefan Monnier Mime-Version: 1.0 Content-Type: text/plain Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="35332"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Cc: 70927@debbugs.gnu.org To: Steven Allen Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Wed May 15 20:51:20 2024 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1s7Jih-00090K-IM for geb-bug-gnu-emacs@m.gmane-mx.org; Wed, 15 May 2024 20:51:19 +0200 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1s7Jic-0008Kf-02; Wed, 15 May 2024 14:51:15 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1s7JiO-0008AT-PW for bug-gnu-emacs@gnu.org; Wed, 15 May 2024 14:51:03 -0400 Original-Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1s7JiO-0004mq-Bw for bug-gnu-emacs@gnu.org; Wed, 15 May 2024 14:51:00 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1s7JiQ-0005vn-3n for bug-gnu-emacs@gnu.org; Wed, 15 May 2024 14:51:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Stefan Monnier Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Wed, 15 May 2024 18:51:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 70927 X-GNU-PR-Package: emacs Original-Received: via spool by 70927-submit@debbugs.gnu.org id=B70927.171579901122776 (code B ref 70927); Wed, 15 May 2024 18:51:02 +0000 Original-Received: (at 70927) by debbugs.gnu.org; 15 May 2024 18:50:11 +0000 Original-Received: from localhost ([127.0.0.1]:43853 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s7Jha-0005vH-W2 for submit@debbugs.gnu.org; Wed, 15 May 2024 14:50:11 -0400 Original-Received: from mailscanner.iro.umontreal.ca ([132.204.25.50]:51824) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s7JhY-0005v1-OV for 70927@debbugs.gnu.org; Wed, 15 May 2024 14:50:09 -0400 Original-Received: from pmg1.iro.umontreal.ca (localhost.localdomain [127.0.0.1]) by pmg1.iro.umontreal.ca (Proxmox) with ESMTP id F12EA100048; Wed, 15 May 2024 14:50:00 -0400 (EDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=iro.umontreal.ca; s=mail; t=1715799000; bh=FSHpMDSTldNPEdEpXuBa5vU70dm8IVNH68iaHY4fANA=; h=From:To:Cc:Subject:In-Reply-To:References:Date:From; b=KA8YXFaIbgqtGf9PIWhvxkTUUz/oLUbqm3C2gtOU3mvwM5WMLkcOKoxcWOHFSrUFp Xs2KNFy1NSUCCv/QYe23gmzghSTIZTw6awov559ZXXI3VuX127xUgatJuchjdFNeqL Oi9m/e+2PwJTmW83xBRk+2clQuzPwUDfckZoudn1frzhAb1Y3Eghqy/vOm64BzP0ZM Kj4qnJbYCg2UxM4W8VdjbgNrIGlPv6TTL5U1YpfX5NUUqf/z4RVBvRKYgvUmbxNfyL expj2CR3Fs8NEpnA3f+gf976/HfbkORBbQQI/bA8FtBaOQYQVp/mxuu0G+W2+c5a0Y v/ERvHX9CpE9g== Original-Received: from mail01.iro.umontreal.ca (unknown [172.31.2.1]) by pmg1.iro.umontreal.ca (Proxmox) with ESMTP id F33DC100035; Wed, 15 May 2024 14:49:59 -0400 (EDT) Original-Received: from lechazo (lechon.iro.umontreal.ca [132.204.27.242]) by mail01.iro.umontreal.ca (Postfix) with ESMTPSA id E50491203FF; Wed, 15 May 2024 14:49:59 -0400 (EDT) In-Reply-To: <87y18dwdri.fsf@stebalien.com> (Steven Allen's message of "Mon, 13 May 2024 15:25:21 -0700") X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Xref: news.gmane.io gmane.emacs.bugs:285115 Archived-At: > A quick fix would be to change `eglot--signal-textDocument/didChange`: > > - from: `(eglot--track-changes-fetch eglot--track-changes)` > - to: `(when eglot--track-changes (eglot--track-changes-fetch eglot--track-changes))` > > But I'm guessing there's some underlying problem and this may be masking > the real issue. Indeed. I pushed the patch below to `master` instead which should also fix the problem. Please confirm that it fixes it for you as well. Maybe `eglot-shutdown` shouldn't end up calling `eglot--signal-textDocument/didChange` at all, but that's a long standing behavior AFAICT, so I'll leave it for some other time. Stefan diff --git a/lisp/progmodes/eglot.el b/lisp/progmodes/eglot.el index 57a019e126d..0ba69f66f0d 100644 --- a/lisp/progmodes/eglot.el +++ b/lisp/progmodes/eglot.el @@ -2022,9 +2022,6 @@ eglot--managed-mode (eldoc-mode 1)) (cl-pushnew (current-buffer) (eglot--managed-buffers (eglot-current-server)))) (t - (when eglot--track-changes - (track-changes-unregister eglot--track-changes) - (setq eglot--track-changes nil)) (remove-hook 'kill-buffer-hook #'eglot--managed-mode-off t) (remove-hook 'kill-buffer-hook #'eglot--signal-textDocument/didClose t) (remove-hook 'before-revert-hook #'eglot--signal-textDocument/didClose t) @@ -2053,7 +2050,10 @@ eglot--managed-mode (delq (current-buffer) (eglot--managed-buffers server))) (when (and eglot-autoshutdown (null (eglot--managed-buffers server))) - (eglot-shutdown server))))))) + (eglot-shutdown server)))) + (when eglot--track-changes + (track-changes-unregister eglot--track-changes) + (setq eglot--track-changes nil))))) (defun eglot--managed-mode-off () "Turn off `eglot--managed-mode' unconditionally."