Skip to content

Commit 42fba8f

Browse files
skangasskangas
committed
Merge from origin/emacs-29
b7f0333 Improve warning about changing the string returned by sym... e62f8b0 Fix visiting XBM/XPM files when 'c-ts-mode' is active 94d1c81 * lisp/mpc.el (mpc-format): Fix oversight in commit 48b6c... a4d9781 Bail early from eglot--apply-text-edits if nothing to do 61d5717 ; Clarify in-code commentary of eglot--after-change 5bbbd70 Improve ergonomics of Eglot's inlay hints c3a5431 Protect against too large size of 'recent-keys' vector 231190b * lisp/net/tramp.el (tramp-yn-prompt-regexp): Fix regexp. 0bebd0e ; Remove 'build-module' and 'html-manual' directories fro... 6674c36 Merge branch 'emacs-29' of git.savannah.gnu.org:/srv/git/... 829e5df Update to Org 9.6.1-48-g92471e e84f878 ; * admin/notes/tree-sitter/starter-guide: Update starter... ea09498 Merge branch 'emacs-29' of git.savannah.gnu.org:/srv/git/... 11592bc ; * lisp/nxml/xmltok.el (xmltok-scan-attributes): Fix las... e388a77 ; Minor copyedits of recent changes in ELisp reference ma... 33a2670 ; Minor fixes in recent Eglot changes d2cf138 ; * doc/misc/eglot.texi (Eglot Commands): Improve indexing. b75e489 ; Again correct node reference casing in doc/misc/eglot.texi a55d2ed ; Remove overly verbose commentary 22a7045 Merge confusing duplicate sections on commands in Eglot m... 3293f93 Don't take over mouse-1 binding on Eglot diagnostics (bug... 013057e ; Prefer "language server" to "LSP server" in Eglot manual 94a21c8 * lisp/progmodes/eglot.el (eglot--connect): Improve Tramp... 0eddfa2 Avoid slowdowns in xmltok-scan-attributes 647c6bf ; * test/lisp/abbrev-tests.el (abbrev--possibly-save-test... 531f8f7 ; * admin/git-bisect-start: Update failing commits # Conflicts: # admin/notes/tree-sitter/build-module/batch.sh # admin/notes/tree-sitter/build-module/build.sh
2 parents 3a11371 + b7f0333 commit 42fba8f

39 files changed

+287
-3560
lines changed

‎admin/git-bisect-start

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ done
8282
# SKIP-BRANCH 58cc931e92ece70c3e64131ee12a799d65409100
8383

8484
## The list below is the exhaustive list of all commits between Dec 1
85-
## 2016 and Jan 31 2023 on which building Emacs with the default
85+
## 2016 and Feb 28 2023 on which building Emacs with the default
8686
## options, on a GNU/Linux computer and with GCC, fails. It is
8787
## possible (though unlikely) that building Emacs with non-default
8888
## options, with other compilers, or on other platforms, would succeed
@@ -1707,3 +1707,16 @@ $REAL_GIT bisect skip $(cat $0 | grep '^# SKIP-SINGLE ' | sed 's/^# SKIP-SINGLE
17071707
# SKIP-SINGLE 1c3ca3bb649b7e812a84b4a559463462d4357080
17081708
# SKIP-SINGLE 48ed4228a75907ae1bb7a2d4314ffb3277c75e3a
17091709
# SKIP-SINGLE b9025c507a3a7dae4de19b18cafaa09b18183832
1710+
# SKIP-SINGLE 8d8464bd5a98598e7a6fe63370545c7f07574926
1711+
# SKIP-SINGLE 11c4177430230ef41cb700c48afecf475cf39893
1712+
# SKIP-SINGLE cf3c89423fabc2c5a7891a5b5465fa995e461218
1713+
# SKIP-SINGLE 8d5d7509b0a2c248084fa349b0b188d4de4af804
1714+
# SKIP-SINGLE b6e2799aa1c3887c2995e115e6ff2f69d59f0e44
1715+
# SKIP-SINGLE 1795839babcf8572a79aaee3c76ca5b357937a59
1716+
# SKIP-SINGLE abfd00e5c02ec0aed8bbac1eca0d0db1874f020a
1717+
# SKIP-SINGLE 8aef401b4f66a64ddfa9390590fb2cae1f96d522
1718+
# SKIP-SINGLE d5bf26f488b7968feed9f43e612a90da2aab15a8
1719+
# SKIP-SINGLE 5d0912f1445e33f1ccf23a84f0dc6d08c4ee2b60
1720+
# SKIP-SINGLE 95692f6754c3a8f55a90df2d6f7ce62be55cdcfc
1721+
# SKIP-SINGLE a3edacd3f547195740304139cb68aaa94d7b18ee
1722+
# SKIP-SINGLE ae4ff4f25fbf704446f8f38d8e818f223b79042b

‎admin/notes/tree-sitter/build-module/README

Lines changed: 0 additions & 17 deletions
This file was deleted.

‎admin/notes/tree-sitter/html-manual/Accessing-Node.html

Lines changed: 0 additions & 205 deletions
This file was deleted.

0 commit comments

Comments
 (0)