From: Stefan Kangas Date: Mon, 20 Mar 2023 05:30:40 +0000 (+0100) Subject: Merge from origin/emacs-29 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=42fba8f36b19536964d6deb6a34f3fd1c02b43dd;p=emacs.git Merge from origin/emacs-29 b7f03333551 Improve warning about changing the string returned by sym... e62f8b0239d Fix visiting XBM/XPM files when 'c-ts-mode' is active 94d1c81cf07 * lisp/mpc.el (mpc-format): Fix oversight in commit 48b6c... a4d97811ed4 Bail early from eglot--apply-text-edits if nothing to do 61d571760b3 ; Clarify in-code commentary of eglot--after-change 5bbbd70f56e Improve ergonomics of Eglot's inlay hints c3a543123ab Protect against too large size of 'recent-keys' vector 231190b37f8 * lisp/net/tramp.el (tramp-yn-prompt-regexp): Fix regexp. 0bebd0e5f09 ; Remove 'build-module' and 'html-manual' directories fro... 6674c362ad9 Merge branch 'emacs-29' of git.savannah.gnu.org:/srv/git/... 829e5dfabea Update to Org 9.6.1-48-g92471e e84f878e19a ; * admin/notes/tree-sitter/starter-guide: Update starter... ea0949853f8 Merge branch 'emacs-29' of git.savannah.gnu.org:/srv/git/... 11592bcfda6 ; * lisp/nxml/xmltok.el (xmltok-scan-attributes): Fix las... e388a77cf0b ; Minor copyedits of recent changes in ELisp reference ma... 33a26703689 ; Minor fixes in recent Eglot changes d2cf1386fa4 ; * doc/misc/eglot.texi (Eglot Commands): Improve indexing. b75e489362b ; Again correct node reference casing in doc/misc/eglot.texi a55d2edc5a9 ; Remove overly verbose commentary 22a70451f34 Merge confusing duplicate sections on commands in Eglot m... 3293f939882 Don't take over mouse-1 binding on Eglot diagnostics (bug... 013057e3512 ; Prefer "language server" to "LSP server" in Eglot manual 94a21c88647 * lisp/progmodes/eglot.el (eglot--connect): Improve Tramp... 0eddfa28ebd Avoid slowdowns in xmltok-scan-attributes 647c6bf2a6c ; * test/lisp/abbrev-tests.el (abbrev--possibly-save-test... 531f8f7103a ; * admin/git-bisect-start: Update failing commits # Conflicts: # admin/notes/tree-sitter/build-module/batch.sh # admin/notes/tree-sitter/build-module/build.sh --- 42fba8f36b19536964d6deb6a34f3fd1c02b43dd