master 9d5ec880b03 1/3: Merge from origin/emacs-29

[Stefan Kangas]

branch: master
commit 9d5ec880b03eb0e779e4ceb0d447d924e0501401
Merge: 5be502a697c 3768b100777
Author: Stefan Kangas <stefankangas@gmail.com>
Commit: Stefan Kangas <stefankangas@gmail.com>

    Merge from origin/emacs-29
    
    3768b100777 ; * lisp/pcomplete.el (pcomplete-allow-modifications): Fi...
    84214578f5a Fix markup in ERC manual
---
 doc/misc/erc.texi | 18 ++++++------------
 lisp/pcomplete.el |  2 +-
 2 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/doc/misc/erc.texi b/doc/misc/erc.texi
index a8d1dd78235..5ad739a77e1 100644
--- a/doc/misc/erc.texi
+++ b/doc/misc/erc.texi
@@ -983,20 +983,17 @@ explore all custom options pertaining to your chosen 
mechanism.
 
 @defopt erc-sasl-mechanism
 The name of an SASL subprotocol type as a @emph{lowercase} symbol.
+The value can be one of the following:
 
-@var{plain} and @var{scram} (``password-based''):
-
-@indentedblock
+@table @asis
+@item @code{plain} and @code{scram} (``password-based'')
 Here, ``password'' refers to your account password, which is usually
 your @samp{NickServ} password.  To make this work, customize
 @code{erc-sasl-user} and @code{erc-sasl-password} or specify the
 @code{:user} and @code{:password} keyword arguments when invoking
 @code{erc-tls}.  Note that @code{:user} cannot be given interactively.
-@end indentedblock
-
-@var{external} (via Client TLS Certificate):
 
-@indentedblock
+@item @code{external} (via Client TLS Certificate)
 This works in conjunction with the @code{:client-certificate} keyword
 offered by @code{erc-tls}.  Just ensure you've registered your
 fingerprint with the network beforehand.  The fingerprint is usually a
@@ -1018,11 +1015,8 @@ of authentication is in effect (being deferred to), so 
depending on
 the specific application or service, there's a remote chance your
 server has something else in mind.
 @end enumerate
-@end indentedblock
 
-@var{ecdsa-nist256p-challenge}:
-
-@indentedblock
+@item @code{ecdsa-nist256p-challenge}
 This mechanism is quite complicated and currently requires the
 external @samp{openssl} executable, so please use something else if at
 all possible.  Ignoring that, specify your key file (e.g.,
@@ -1036,7 +1030,7 @@ ERC> /msg NickServ set property \
 
 @end example
 (You may be able to omit the @samp{property} subcommand.)
-@end indentedblock
+@end table
 
 @end defopt
 
diff --git a/lisp/pcomplete.el b/lisp/pcomplete.el
index ef286b70fe0..8be026b5a82 100644
--- a/lisp/pcomplete.el
+++ b/lisp/pcomplete.el
@@ -193,7 +193,7 @@ and how is entirely up to the behavior of the
   "If non-nil, allow effects in `pcomplete-parse-arguments-function'.
 For the `pcomplete' command, it was common for functions in
 `pcomplete-parse-arguments-function' to make modifications to the
-buffer, like expanding variables are such.
+buffer, like expanding variables and such.
 For `completion-at-point-functions', this is not an option any more, so
 this variable is used to tell `pcomplete-parse-arguments-function'
 whether it can do the modifications like it used to, or whether