master updated (a8539b7919e -> c150777f498)

eliz pushed a change to branch master.

      from  a8539b7919e markdown-ts-mode: Make inline HTML embed local (bug#81334)
      adds  b65f8ef93d0 (sh-font-lock-paren): Fix bug#81192
      adds  97e24e12d5b Fix C-x v w a/A on the repository root
      adds  5e3f68c669c Fix emacs-eglot test on emba
      adds  037076824f1 ; * src/treesit.c (treesit_cursor_helper_1): Fix last change.
      adds  1da79a162dd ; * src/treesit.c (treesit_cursor_helper_1): Further explanation.
      adds  158a0391359 ; * admin/MAINTAINERS: Mark F. Jason Park as co-maintaining ERC.
      adds  ab88a0be86d Fix Dired problem with nonexistent directory (bug#81509)
      adds  5b5cc17832c vc-working-revision: Don't bind default-directory to a relative name
      adds  c6d60333609 Fix attendee lookup in gnus-icalendar
      adds  ad60eb855d2 ; Improve documentation of "shadow cursor"
       new  79c1f363a36 Merge from origin/emacs-31
      adds  7b0f33cb741 Backport: Use default exec-suffixes when needed (bug#81280, bug#81517)
      adds  99a9307235c Avoid errors in 'dabbrev-expand'
       new  2fd87a1db4c ; Merge from origin/emacs-31
      adds  cba18a7f9cd Fix starting local processes in the MS-Windows build
      adds  4f36e9e8855 File name with newline: require 'ls' --dired switch
      adds  b6332ac21b1 Do not asynchronously prompt to save buffers after vc-checkin
      adds  b21266e4cbe Assign some calendar & icalendar files to packages
      adds  c6e2bd3e3b8 Restore current buffer after clone-indirect-buffer-hook errors
      adds  8e70e6d687b * lisp/vc/vc.el (vc-delete-file): Don't backup backup files.
      adds  a9fc13614ec Export GIT_OPTIONAL_LOCKS=0 for "git status" invocations (bug#80903)
      adds  ed4a3e251b5 Prevent 'package-menu--mark-upgrades-1' from blocking
      adds  26e1c1792ec Summarize changes when upgrading packages
      adds  660e2f9f6f3 ; * lisp/emacs-lisp/package.el (package-upgrade-all): Fix typo.
      adds  0b8d2acdd24 ; * lisp/dired-aux.el (dired-create-destination-dirs): Doc fix (bug#81528).
      adds  cf98d9d725f Eglot: do more orthodox use of progress reporters (bug#81514)
      adds  d31d3245ba4 Fix display of ambiguous-width CJK characters in GUI sessions
       new  8ed037b9c55 Merge from origin/emacs-31
       new  c150777f498 Fix merge snafu in dired-aux.el


Summary of changes:
 admin/MAINTAINERS                                  |  5 +++
 doc/emacs/files.texi                               | 22 ++++++---
 etc/NEWS.31                                        |  8 ++++
 lisp/calendar/diary-icalendar.el                   |  1 +
 lisp/calendar/diary-lib.el                         |  1 +
 lisp/calendar/icalendar-ast.el                     |  1 +
 lisp/calendar/icalendar-macs.el                    |  1 +
 lisp/calendar/icalendar-mode.el                    |  1 +
 lisp/calendar/icalendar-parser.el                  |  1 +
 lisp/calendar/icalendar-recur.el                   |  1 +
 lisp/calendar/icalendar-shortdoc.el                |  1 +
 lisp/calendar/icalendar-utils.el                   |  1 +
 lisp/dired-aux.el                                  |  5 ++-
 lisp/dired.el                                      | 52 ++++++++++++++--------
 lisp/emacs-lisp/package.el                         | 20 ++++++---
 lisp/gnus/gnus-icalendar.el                        | 21 ++++++---
 lisp/international/characters.el                   | 11 ++++-
 lisp/progmodes/eglot.el                            |  8 +++-
 lisp/progmodes/sh-script.el                        |  2 +-
 lisp/vc/diff-mode.el                               |  5 ++-
 lisp/vc/vc-dispatcher.el                           |  6 ++-
 lisp/vc/vc-git.el                                  | 39 ++++++++--------
 lisp/vc/vc-hooks.el                                | 13 +++---
 lisp/vc/vc.el                                      | 29 ++++++------
 src/buffer.c                                       |  5 ++-
 src/treesit.c                                      | 10 ++---
 src/w32proc.c                                      |  4 +-
 test/infra/Dockerfile.emba                         |  2 +-
 test/lisp/dired-tests.el                           | 14 +++---
 .../progmodes/sh-script-resources/sh-indents.erts  | 13 ++++++
 test/lisp/vc/vc-tests/vc-tests.el                  | 14 +++---
 31 files changed, 208 insertions(+), 109 deletions(-)