master updated (d044ca25d03 -> cc5491c575d)

Eli Zaretskii <[email protected]> Sat, 25 Jul 2026 04:52:15 -0400 (EDT)
Newsgroups gmane.emacs.diffs
Message-ID <[email protected]>
eliz pushed a change to branch master.

      from  d044ca25d03 ; * etc/NEWS: Fix typo and wording of recently-added entry.
      adds  f8d7f87e73e ; * ChangeLog.5: Remove an entry which shouldn't have been there.
      adds  1c042fa0b1e Fix discarding user edits after async commit completes (bug#81453)
      adds  1bdbdade6ba Merge branch 'emacs-31' of git.savannah.gnu.org:/srv/git/emacs into emacs-31
       new  eec7b8d29a2 Merge from origin/emacs-31
      adds  6f992eaa49b vc--count-outgoing: Set process query on exit flag to nil
       new  31c0007f583 ; Merge from origin/emacs-31
      adds  0f6d977a88f ; * test/src/xdisp-tests.el (xdisp-test-format-mode-line): Use s1, s2.
      adds  6b670907fa9 Update tree-sitter manual for embed level
      adds  29bbd02347d Fix treesit_cursor_helper_1 for zero-width nodes (bug#81436)
      adds  19eeda16a4a ; Fix recent changes in treesit documentation
      adds  2771f99c722 ; * admin/MAINTAINERS: Mark Amin as maintaining some more files.
       new  9c2fab94ec1 Merge from origin/emacs-31
      adds  0448b4e09af Backport: Fix 'with-tramp-progress-reporter' (bug#81455)
      adds  7cc260dddd9 Backport: ; Fix last change
      adds  30539fe149b Backport: ; Fix last change, again
       new  e000b6c4c68 ; Merge from origin/emacs-31
      adds  633a998bcfd ; Improve documentation of text properties for strings
      adds  296869994e4 ; Remove 'sit-for' treesit parser workaround (bug#81019)
      adds  39cb1e483fd ; * lisp/bookmark.el (bookmark-alist): Doc fix (bug#81461).
       new  cc5491c575d Merge from origin/emacs-31


Summary of changes:
 ChangeLog.5                        |   7 --
 admin/MAINTAINERS                  |   3 +
 doc/lispref/parsing.texi           | 132 ++++++++++++++++++++++++++-----------
 doc/lispref/strings.texi           |   3 +
 lisp/bookmark.el                   |   2 +-
 lisp/textmodes/markdown-ts-mode.el |   2 -
 lisp/treesit.el                    |   2 +-
 lisp/vc/vc-dispatcher.el           |  50 +++++++++-----
 lisp/vc/vc.el                      |   2 +-
 src/treesit.c                      |  11 ++--
 test/src/xdisp-tests.el            |   8 ++-
 11 files changed, 149 insertions(+), 73 deletions(-)