Merge from origin/emacs-31

7a17f97baa7 Prettify special glyphs
f13287fde0d Revert "sh-script: Mark + and * as punctuation rather tha...
70b79b3ed8d Rename `icalendar-recur' type and related functions
3d2bb233f27 ; Minor Tramp changes
f6281d757d3 ; * etc/NEWS: Tell how to disable 'markdown-ts-mode'.
142b1e0d4c3 Fix Lisp injection via X-Draft-From in Gnus
d6f7b2d99bd Save/restore old_buffer slot via window configurations (B...
e0fbecaf658 Adapt ert-remote-temporary-file-directory settings
3de7f0ce5e5 Fix warning message in 'markdown-ts-mode--initialize'
7df8604ea63 ; Improve documentation of lazy-highlight in search and r...
2936b36164d Fix "assertion 'GTK_IS_WINDOW (window)' failed"
98348a0bdc9 [Xt] Fix child frame resizing glitch
13b29eebc16 Eglot: use standard face for completion annotations (bug#...

# Conflicts:
#	etc/NEWS

1 files changed, 20 insertions, 1 deletions

diff --git a/etc/NEWS.31 b/etc/NEWS.31
index 3021ad42a12..083e6b50ea4 100644
--- a/etc/NEWS.31
+++ b/etc/NEWS.31
@@ -169,6 +169,12 @@ behavior, customize 'find-function-mode-lower-precedence' to non-nil.
 ---
 ** 'find-function' can now find 'cl-defmethod' invocations inside macros.
 
+---
+** New minor mode 'prettify-special-glyphs-mode'.
+The new minor mode prettifies the special character glyphs (truncation
+and continuation) on TTY frames (and GUI frames without fringes).  You
+can customize the associated new face 'special-glyphs'.
+
 ** Minibuffer and Completions
 
 +++
@@ -3931,7 +3937,20 @@ A major mode based on 'conf-mode' for editing ".npmrc" files.
 ** New major modes based on the tree-sitter library
 
 *** New major mode 'markdown-ts-mode'.
-A major mode based on the tree-sitter library for editing Markdown files.
+A major mode based on the tree-sitter library for editing Markdown
+files.  This is now the default major mode for Markdown files.  If you
+don't have the necessary tree-sitter grammar libraries installed, or if
+your Emacs was built without tree-sitter support, Emacs will now show a
+warning to that effect when you visit a Markdown file.  If you don't
+want to use this mode and want to avoid these warnings, add the
+following to your init file:
+
+  (add-to-list 'auto-mode-alist '("\\.md\\'" . fundamental-mode))
+  (add-to-list 'auto-mode-alist '("\\.markdown\\'" . fundamental-mode))
+  (add-to-list 'auto-mode-alist '("\\.mdx\\'" . fundamental-mode))
+
+This will cause Emacs to visit Markdown files in Fundamental mode, which
+was the default before this mode was added to Emacs.
 
 *** New major mode 'mhtml-ts-mode'.
 An optional major mode based on the tree-sitter library for editing HTML