Merge from origin/emacs-30

3d2a8186793 * doc/misc/efaq-w32.texi (UTF-8 encoding): New section (b...
ec50d775acf ; * doc/misc/flymake.texi (Finding diagnostics): Fix a ty...
293e258a1b2 * doc/emacs/screen.texi (Mode Line): Fix reference.
8eb192c23df ; * admin/make-tarball.txt: Update the "Web pages" sectio...

4 files changed, 74 insertions, 8 deletions

diff --git a/admin/make-tarball.txt b/admin/make-tarball.txt
index 61d19e54b8e..3257dc6ce46 100644
--- a/admin/make-tarball.txt
+++ b/admin/make-tarball.txt
@@ -380,12 +380,14 @@ As soon as possible after a release, the Emacs web pages at
 <https://www.gnu.org/software/emacs/> should be updated.
 (See admin/notes/www for general information.)
 
-The pages to update are:
-
-emacs.html (for a new major release, a more thorough update is needed)
-history.html
-add the new NEWS file as news/NEWS.xx.y
-Copy new etc/MACHINES to MACHINES and CONTRIBUTE to CONTRIBUTE
+The pages and files to update are:
+
+ . emacs.html (see below; for a new major release, a more thorough
+   update is needed)
+ . history.html (add a line for the new release)
+ . add the new NEWS file as news/NEWS.xx.y
+ . copy new etc/MACHINES to MACHINES and CONTRIBUTE to CONTRIBUTE
+ . possibly/rarely also download.html (see below)
 
 For every new release, a banner is displayed on top of the emacs.html
 page.  Uncomment the release banner in emacs.html.  Keep it on the page
diff --git a/doc/emacs/screen.texi b/doc/emacs/screen.texi
index ca3690edb9a..e2546ce132d 100644
--- a/doc/emacs/screen.texi
+++ b/doc/emacs/screen.texi
@@ -234,7 +234,7 @@ current buffer is on a remote machine, @samp{@@} is displayed instead.
   @var{d} appears if the window is dedicated to its current buffer.
 It appears as @samp{D} for strong dedication and @samp{d} for other
 forms of dedication.  If the window is not dedicated, @var{d} does not
-appear.  @xref{Dedicated Windows,, elisp, The Emacs Lisp Reference
+appear.  @xref{Dedicated Windows,,, elisp, The Emacs Lisp Reference
 Manual}.
 
   @var{fr} gives the selected frame name (@pxref{Frames}).  It appears
diff --git a/doc/misc/efaq-w32.texi b/doc/misc/efaq-w32.texi
index e50716ff654..5c24364286d 100644
--- a/doc/misc/efaq-w32.texi
+++ b/doc/misc/efaq-w32.texi
@@ -913,6 +913,7 @@ The doc string contains a list of the system sounds you can use.
 * Multilingual fonts::
 * Font menu::
 * Line ends::
+* UTF-8 encoding::
 @end menu
 
 @node Font names
@@ -1191,6 +1192,69 @@ recent versions of Emacs, this is seldom useful for existing files,
 but can still be used to influence the choice of line ends for newly
 created files.
 
+@node UTF-8 encoding
+@section Can I use UTF-8 as default encoding on MS-Windows?
+@cindex UTF-8 as default encoding on Windows
+@cindex codepage 65001 support in Emacs
+
+Recent versions of MS-Windows (Windows 10 since build 1803, and Windows
+11 or later versions) allow to use UTF-8 (a.k.a.@: ``codepage 65001'')
+as the default system codepage.  As of this writing, this is still an
+experimental feature, even in Windows 11, and is disabled by default.
+On Windows 11 you can enable it as follows:
+
+@enumerate
+@item
+Open Settings.
+
+@item
+Select ``Time & Language'', then ``Language & region''.
+
+@item
+Click on ``Administrative language settings''.
+
+@item
+On the dialog that pops up click ``Change system locale...''
+
+@item
+In the ``Region Settings'' dialog that pops up, check the check-box
+labeled ``Beta: Use Unicode UTF-8 for worldwide language support'', then
+confirm by clicking ``OK'' to both dialogs.
+@end enumerate
+
+@cindex UCRT runtime library
+@cindex MSVCRT runtime library
+Emacs supports this feature starting from version 30.2, but only when
+running on the versions of Windows that provide this feature, and only
+if the Emacs executable was linked against the @samp{UCRT} library as
+the Windows C runtime, not against the older @samp{MSVCRT}.  This is
+because the C functions that deal with non-ASCII characters, as
+implemented by @samp{MSVCRT}, don't support UTF-8 as the multibyte
+encoding of non-ASCII characters.  (Which runtime to link against is
+determined by the person who built your Emacs binary.  Note that using
+Emacs linked against @samp{UCRT} needs all of the libraries loaded by
+Emacs dynamically, such as GnuTLS, image libraries like @samp{rsvg},
+Tree-sitter, and all the others, to be also linked against @samp{UCRT},
+otherwise subtle problems could happen when dealing with non-ASCII
+characters and strings.)
+
+If you have an Emacs linked against @samp{UCRT}, and you turned on the
+UTF-8 support in Windows as described above, you can customize Emacs to
+use UTF-8 as your default encoding, e.g., by adding
+
+@lisp
+ (prefer-coding-system 'utf-8)
+@end lisp
+
+@noindent
+to your init file, or by using the @samp{UTF-8} language environment
+(@pxref{Language Environments,,, emacs, The GNU Emacs Manual}) in your
+Emacs sessions.
+
+Please be aware that, since this feature of Windows is still in beta,
+there could be some subtle issues with it.  So we do not yet recommend
+to turn this on, unless you feel adventurous.
+
 @c ------------------------------------------------------------
 @node Printing
 @chapter Printing
diff --git a/doc/misc/flymake.texi b/doc/misc/flymake.texi
index cc364813f8b..42935703c11 100644
--- a/doc/misc/flymake.texi
+++ b/doc/misc/flymake.texi
@@ -152,7 +152,7 @@ variables})
 
 @cindex next and previous diagnostic
 If the diagnostics are outside the visible region of the buffer,
-@code{flymake-goto-next-error} and @code{flymake-goto-prev-error} are
+@code{flymake-goto-next-error} and @code{flymake-goto-prev-error}
 let you navigate to the next/previous erroneous regions,
 respectively.  It might be a good idea to map them to @kbd{M-n} and
 @kbd{M-p} in @code{flymake-mode}, by adding to your init file: