Merge from origin/emacs-31

2c2f1c00acc ; * lisp/vc/vc-dir.el (vc-dir-update): Add an assertion.
51f823a3afa ; * etc/NEWS: Fix annotation.
271cc5c76c0 More tests for fill-paragraph-handle-comment.erts
cc9f35c54ba ; * etc/PROBLEMS: Minor fixes of last change.
2727a6f4e8d ; Document problems caused by validation of *.eln files o...
f1dd84bec99 ; * lisp/play/doctor.el (doctor-death): Fix Samaritans UR...
0bfbe06090c Update to Org 9.8.5
aac5e0457ae Eglot: replace eglot-prefer-plaintext with eglot-document...
ec3d662de0b Make HTML button elements tab-stoppable in eww (bug#81107)

# Conflicts:
#	etc/NEWS

4 files changed, 45 insertions, 6 deletions

diff --git a/etc/EGLOT-NEWS b/etc/EGLOT-NEWS
index eb4040d107e..f0f595fa500 100644
--- a/etc/EGLOT-NEWS
+++ b/etc/EGLOT-NEWS
@@ -32,11 +32,15 @@ New key bindings: 'k' shuts down, 'r' reconnects, 'e' visits the events
 buffer, 'w' shows workspace configuration, and 'RET' invokes
 'eglot-describe-connection'.
 
-** Eglot uses new built-in 'markdown-ts-mode' of Emacs 31 (bug#80127)
+** New LSP documentation rendering backends (bug#80127)
 
-This means that on newer versions of Emacs the external
-'markdown-mode.el' package does not need to be installed to render
-Markdown content.
+Eglot uses new built-in 'markdown-ts-mode' of Emacs 31, which means that
+on newer versions of Emacs the external 'markdown-mode.el' package does
+not need to be installed to render Markdown content.
+
+The variable 'eglot-documentation-renderer' replaces the now-obsolete
+'eglot-prefer-plaintext'.  By default, the variable selects a markdown
+renderer to use throughout the session.
 
 
 * Changes in Eglot 1.23 (2/4/2026)
diff --git a/etc/NEWS.31 b/etc/NEWS.31
index 95bc966d47d..dc45122a6db 100644
--- a/etc/NEWS.31
+++ b/etc/NEWS.31
@@ -3005,7 +3005,7 @@ In addition, the Git backend has been fixed to display missing files as
 There is still some further work to do to rationalize VC's handling of
 file removal.
 
----
++++
 *** New user option 'vc-dir-auto-hide-up-to-date'.
 If you customize this option to 'revert', the 'g' command to refresh
 the VC Directory buffer also has the effect of the 'x' command.
diff --git a/etc/PROBLEMS b/etc/PROBLEMS
index 655bfd6c173..54302968e6d 100644
--- a/etc/PROBLEMS
+++ b/etc/PROBLEMS
@@ -3646,6 +3646,41 @@ file; for example:
       "/usr/local/opt/libgccjit/lib/gcc/11"
       "/usr/local/opt/gcc/lib/gcc/11/gcc/x86_64-apple-darwin20/11.2.0") ":"))
 
+** Stuttering and missed keypresses during Native Compilation on macOS
+
+Natively compiled modules are validated by macOS the first time that
+they are loaded.  On some machines, this can cause Emacs to be
+temporarily less responsive while a large number of '*.eln' files are
+being compiled and loaded.
+
+One can force the first load of the module to happen in the async
+compilation worker by adding this to their early-init.el:
+
+  (setq native-comp-async-env-modifier-form
+	'(progn
+	   (defun c/native-comp--preload-eln-after-compile
+	       (compile function-or-file &optional with-late-load output)
+	     "Preload async native-comp output in the compiler child."
+	     (prog1 (funcall compile function-or-file with-late-load output)
+	       (when (and (stringp function-or-file) with-late-load)
+		 (with-demoted-errors "Async native .eln preload: %S"
+		   (let ((eln-file (comp-el-to-eln-filename function-or-file)))
+		     (when (file-exists-p eln-file)
+		       (native-elisp-load eln-file t)))))))
+
+	   (advice-add 'comp--native-compile
+		       :around #'c/native-comp--preload-eln-after-compile)))
+
+Alternatively, if one is willing to accept the associated security
+risks, one could disable library validation on their Emacs binary:
+
+  codesign --force --sign - \
+      --entitlements macos-disable-library-validation.entitlements \
+      src/emacs
+
+Disabling validation might expose you to security risks, so please
+consider that before using this recipe.
+
 ** Text dictation doesn't work on macOS
 
 The indication is that the macOS keyboard shortcut for dictation is ignored.
diff --git a/etc/refcards/orgcard.tex b/etc/refcards/orgcard.tex
index dcd3208d132..8b38b98897e 100644
--- a/etc/refcards/orgcard.tex
+++ b/etc/refcards/orgcard.tex
@@ -1,5 +1,5 @@
 % Reference Card for Org Mode
-\def\orgversionnumber{9.8.3}
+\def\orgversionnumber{9.8.5}
 \def\versionyear{2026}          % latest update
 \input emacsver.tex