Merge from origin/emacs-31

cf96e9cb5a5 ; Fix byte-compilation warnings in non-Tree-Sitter builds
23575adc7be ; * doc/lispref/variables.texi (Local Variables): Fix typ...
8b6fb2f6465 ; * doc/lispref/variables.texi (Local Variables): Fix 'na...
d3c72b83890 ; * src/xdisp.c (display_line): Fix commentary (bug#80693).
a981517b72e Fill margins with 'margin' face on truncated screen lines
8e374990357 ; * doc/lispref/os.texi (Init File): Fix markup (bug#81049).
f4c326c378a ; * src/sfnt.c (sfnt_read_cmap_format_12): Assert there's...
bf89ee6d078 ; * etc/PROBLEMS: Cursor not shown on Windows with system...
20500d62006 ; htmlfontify: Handle 'reset' face attribute value (bug#8...
d0d657fa902 ; Minor Tramp cleanup
93ea0d7d289 ; Improve documentation of VC commands in Dired
318084829c5 Eglot: adjust reference to completion frontends in manual
2a166c2dbdb Eldoc: display documentation in visual-line-mode
aba60ad0c5b Eglot: prefer markdown-ts-view-mode for markup rendering ...
689c3bd5088 Use 'read-multiple-choice' in 'markdown-ts-mode' (bug#81027)
71809ee5df5 Fix 'markdown-ts-code-span' face (bug#81026)
286833e401d Add read-only 'markdown-ts-view-mode' (bug#81023)
b39c123490b Fix strikethrough in 'markdown-ts-mode' (bug#80991)
0be998d4bc0 Fix code-span in headings in 'markdown-ts-mode' (bug#80979)
a00beb3a31b Make 'markdown-ts-inline-images' buffer local and test fo...
a0c05029fd1 * etc/NEWS: Mention new user option tramp-propagate-emacs...
2e71d2c709f Propagate EMACSCLIENT_TRAMP to remote hosts with Tramp
ff96db93f23 keyboard-tests.el: Try and fix the failure on EMBA
ce3098752cf doc: Remove long obsolete references to `package-initialize`
9bc04b001ac vc-next-action: Call vc-delete-file on FILESET-ONLY-FILES
13039e3442b ; touch-up last commit: copyright and comments
c2a24dcec8b ; update msys2 build helper for Emacs 31 & UCRT
3630baae720 hideshow: Support new 'margin' face for margin indicators...
20d17df3f4f Use the new 'margin' face in Flymake (bug#80693)
07f2bbc905d vc-dir-resynch-file: Pass down non-truename'd FILE

8 files changed, 47 insertions, 39 deletions

diff --git a/doc/emacs/dired.texi b/doc/emacs/dired.texi
index 9abef21f459..1991ab0858a 100644
--- a/doc/emacs/dired.texi
+++ b/doc/emacs/dired.texi
@@ -761,7 +761,7 @@ that operates on the marked files finishes.
 @cindex operating on files in Dired
 
   This section describes the basic Dired commands to operate on one file
-or several files.  All of these commands are capital letters; all of
+or several files.  Many of these commands are capital letters; all of
 them use the minibuffer, either to read an argument or to ask for
 confirmation, before they act.  All of them let you specify the
 files to manipulate in these ways:
@@ -1022,6 +1022,21 @@ single archive anywhere on the file system.  The default archive is
 controlled by the @code{dired-compress-directory-default-suffix} user
 option.  Also see @code{dired-compress-files-alist}.
 
+@cindex Dired and version control
+@findex dired-vc-next-action
+@kindex C-x v v @r{(Dired)}
+@item C-x v v
+@itemx C-x v = @r{(Dired)}
+@itemx C-x v l @r{(Dired)}
+  If the directory you are visiting is under version control
+(@pxref{Version Control}), then the normal VC commands will operate on
+the selected files.  For example, @kbd{C-x v v} invokes
+@code{dired-vc-next-action}, which does the same as
+@code{vc-next-action} in a buffer visiting a file under version control
+(@pxref{Basic VC Editing}).  Similarly, @kbd{C-x v =} shows the diffs
+between the marked files and their committed versions, and @code{C-x v l}
+shows the VC change history for the marked files.
+
 @findex epa-dired-do-decrypt
 @kindex :d @r{(Dired)}
 @cindex decrypting files (in Dired)
@@ -1947,11 +1962,6 @@ file/directory listings.  To change this, customize the options
 @code{dired-hide-details-hide-symlink-targets} and
 @code{dired-hide-details-hide-information-lines}, respectively.
 
-@cindex Dired and version control
-  If the directory you are visiting is under version control
-(@pxref{Version Control}), then the normal VC diff and log commands
-will operate on the selected files.
-
 @findex dired-compare-directories
   The command @kbd{M-x dired-compare-directories} is used to compare
 the current Dired buffer with another directory.  It marks all the files
diff --git a/doc/emacs/maintaining.texi b/doc/emacs/maintaining.texi
index 2400440f951..a1825c5e515 100644
--- a/doc/emacs/maintaining.texi
+++ b/doc/emacs/maintaining.texi
@@ -862,7 +862,7 @@ v} to check-out the file and start editing it.
 Compare the work files in the current VC fileset with the versions you
 started from (@code{vc-diff}).  With a prefix argument, prompt for two
 revisions of the current VC fileset and compare them.  You can also
-call this command from a Dired buffer (@pxref{Dired}).
+call this command from a Dired buffer (@pxref{Operating on Files}).
 
 @ifnottex
 @item M-x vc-ediff
@@ -1137,9 +1137,9 @@ Buffer}).  If invoked from a buffer visiting a file, the current
 fileset consists of that single file, and point in the displayed
 @file{*vc-change-log*} buffer is centered at the revision of that
 file.  If invoked from a VC Directory buffer (@pxref{VC Directory
-Mode}) or from a Dired buffer (@pxref{Dired}), the fileset consists of
-all the marked files, defaulting to the file shown on the current line
-in the directory buffer if no file is marked.
+Mode}) or from a Dired buffer (@pxref{Operating on Files}), the fileset
+consists of all the marked files, defaulting to the file shown on the
+current line in the directory buffer if no file is marked.
 
   If the fileset includes one or more directories, the resulting
 @file{*vc-change-log*} buffer shows a short log of changes (one line
diff --git a/doc/lispref/os.texi b/doc/lispref/os.texi
index 72a1fdc7878..809fa36098a 100644
--- a/doc/lispref/os.texi
+++ b/doc/lispref/os.texi
@@ -411,8 +411,8 @@ that the early init file is loaded much earlier during the startup
 process, so you can use it to customize some things that are
 initialized before loading the regular init file.  For example, you
 can customize the process of initializing the package system, by
-setting variables such as @var{package-load-list} or
-@var{package-enable-at-startup}.  @xref{Package Installation,,,
+setting variables such as @code{package-load-list} or
+@code{package-enable-at-startup}.  @xref{Package Installation,,,
 emacs,The GNU Emacs Manual}.
 
 @cindex default init file
diff --git a/doc/lispref/package.texi b/doc/lispref/package.texi
index 8f3f5fe79b0..3097ed02345 100644
--- a/doc/lispref/package.texi
+++ b/doc/lispref/package.texi
@@ -133,15 +133,6 @@ init file, and any code that should run after it in the primary init
 file (@pxref{Init File,,, emacs, The GNU Emacs Manual}).
 @end defun
 
-@deffn Command package-initialize &optional no-activate
-This function initializes Emacs's internal record of which packages are
-installed, and then calls @code{package-activate-all}.
-
-The optional argument @var{no-activate}, if non-@code{nil}, causes
-Emacs to update its record of installed packages without actually
-making them available.
-@end deffn
-
 @node Simple Packages
 @section Simple Packages
 @cindex single file package
diff --git a/doc/lispref/variables.texi b/doc/lispref/variables.texi
index abb2c883f78..8779cf88917 100644
--- a/doc/lispref/variables.texi
+++ b/doc/lispref/variables.texi
@@ -282,7 +282,7 @@ previous example is equivalent to using nested @code{let} bindings:
 
 @end defspec
 
-@defspec letrec (bindings@dots{}) forms@dots{}
+@defmac letrec (bindings@dots{}) forms@dots{}
 This special form is like @code{let*}, but all the variables are bound
 before any of the local values are computed.  The values are then
 assigned to the locally bound variables.  This is useful only when
@@ -299,11 +299,11 @@ being run once:
                     (remove-hook 'post-command-hook hookfun))))
   (add-hook 'post-command-hook hookfun))
 @end lisp
-@end defspec
+@end defmac
 
 @cindex dynamic binding, temporarily
 @cindex dynamic let-binding
-@defspec dlet (bindings@dots{}) forms@dots{}
+@defmac dlet (bindings@dots{}) forms@dots{}
 This special form is like @code{let}, but it binds all variables
 dynamically.  This is rarely useful---you usually want to bind normal
 variables lexically, and special variables (i.e., variables that are
@@ -315,9 +315,9 @@ that certain variables are dynamically bound (@pxref{Dynamic
 Binding}), but it's impractical to @code{defvar} these variables.
 @code{dlet} will temporarily make the bound variables special, execute
 the forms, and then make the variables non-special again.
-@end defspec
+@end defmac
 
-@defspec named-let name bindings &rest body
+@defmac named-let name bindings &rest body
 This special form is a looping construct inspired from the
 Scheme language.  It is similar to @code{let}: It binds the variables in
 @var{bindings}, and then evaluates @var{body}.  However,
@@ -353,7 +353,7 @@ itself, as is the case in the recursive call to @code{sum} above.
 
 @code{named-let} can be used only when lexical-binding is enabled.
 @xref{Lexical Binding}.
-@end defspec
+@end defmac
 
   Here is a complete list of the other facilities that create local
 bindings:
diff --git a/doc/misc/eglot.texi b/doc/misc/eglot.texi
index 0b6be34c41f..d501fe32d5d 100644
--- a/doc/misc/eglot.texi
+++ b/doc/misc/eglot.texi
@@ -474,11 +474,11 @@ Code reformatting via the @code{eglot-format} and related commands
 supported and is activated automatically as you type.
 
 @item
-If a completion package such as the Company package (a popular
-third-party completion package providing @code{company-mode}), is
-installed, Eglot enhances it by providing completion candidates based on
-the language server's analysis of the source code.  (Company can be
-installed from GNU ELPA.)
+Eglot enhances symbol completion front-ends by providing completion
+candidates based on the language server's understanding of the source
+code (@pxref{Symbol Completion,,, emacs, GNU Emacs Manual}).  The
+Company package, installable from GNU ELPA, is a popular package known
+to work well with Eglot.
 
 @item
 If YASnippet, a popular third-party package for automatic insertion of
@@ -488,12 +488,11 @@ completion package to instantiate these snippets using YASnippet.
 (YASnippet can be installed from GNU ELPA.)
 
 @item
-If the popular third-party package @code{markdown-mode} is installed,
-and the server provides at-point documentation formatted as Markdown in
+When the server provides at-point documentation formatted as Markdown in
 addition to plain text, Eglot arranges for the ElDoc package to enrich
-this text with fontifications and other nice formatting before
-displaying it to the user.  This makes the documentation shown by ElDoc
-look nicer on display.
+this text with fontifications, hyperlinks and other nice formatting
+before displaying it to the user.  This makes the documentation shown by
+ElDoc look nicer on display.
 
 @item
 In addition to enabling and enhancing other features and packages, Eglot
@@ -1969,7 +1968,7 @@ directory is a way to tell the maintainers about ELPA package versions.
 
 @item
 Include a recipe to replicate the problem with @emph{a clean Emacs run}.
-The invocation @code{emacs -Q -f package-initialize} starts Emacs with
+The invocation @code{emacs -Q -f package-activate-all} starts Emacs with
 no configuration and initializes the ELPA packages.  A very minimal
 @file{.emacs} initialization file (10 lines or less) is also acceptable
 and good means to describe changes to variables.
diff --git a/doc/misc/org.org b/doc/misc/org.org
index ab0f8a9c1a6..8644109a6a1 100644
--- a/doc/misc/org.org
+++ b/doc/misc/org.org
@@ -125,7 +125,7 @@ To avoid interference with the built-in Org mode, you can use the
 command line (you need Emacs 30 or later):
 
 #+begin_src sh
-emacs -Q -batch -eval "(progn (require 'package) (package-initialize) (package-refresh-contents) (package-upgrade 'org))"
+emacs -Q -batch -eval "(progn (package-refresh-contents) (package-upgrade 'org))"
 #+end_src
 
 This approach has the advantage of isolating the upgrade process from
diff --git a/doc/misc/tramp.texi b/doc/misc/tramp.texi
index 8428109fde7..ae65cf2a620 100644
--- a/doc/misc/tramp.texi
+++ b/doc/misc/tramp.texi
@@ -4227,6 +4227,14 @@ called is local or remote, since @value{tramp} would add just the
 @env{HGPLAIN} setting and local processes would take whole value of
 @code{process-environment} along with the new value of @env{HGPLAIN}.
 
+@vindex tramp-propagate-emacsclient-tramp
+@vindex EMACSCLIENT_TRAMP@r{, environment variable}
+If you set the user option @code{tramp-propagate-emacsclient-tramp} to
+a non-@code{nil} value, the environment variable
+@env{EMACSCLIENT_TRAMP} will be set to a value which allows to call
+@command{emacsclient} from a process running on the remote
+host. @xref{emacsclient Options, , , emacs}.
+
 For integrating other Emacs packages so @value{tramp} can execute
 remotely, please file a bug report.  @xref{Bug Reports}.