master 050086931af 4/5: Merge from origin/emacs-29

[Eli Zaretskii]

branch: master
commit 050086931afa090947d2c0730a8a6eb0f33a7dd9
Merge: a201b334bec 196def4fa64
Author: Eli Zaretskii <eliz@gnu.org>
Commit: Eli Zaretskii <eliz@gnu.org>

    Merge from origin/emacs-29
    
    196def4fa64 Fix description of 'Package-Requires' library header
    c1778432790 ; * doc/misc/tramp.texi (FUSE setup): Fix typo.
    a64336cbb9c * lisp/emacs-lisp/cl-lib.el (cl--defalias): Improve&fix d...
    da8b85b577d Add two docstrings in cl-lib.el
---
 doc/lispref/tips.texi     | 15 +++++++++++++++
 doc/misc/tramp.texi       |  2 +-
 lisp/emacs-lisp/cl-lib.el |  3 +++
 3 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/doc/lispref/tips.texi b/doc/lispref/tips.texi
index 6128fef5d99..81a5e1688fd 100644
--- a/doc/lispref/tips.texi
+++ b/doc/lispref/tips.texi
@@ -1169,6 +1169,21 @@ element) is equivalent to entry with version "0".  For 
instance:
 ;; Package-Requires: ((gnus "1.0") (bubbles "2.7.2") cl-lib (seq))
 @end smallexample
 
+Packages that don't need to support Emacs versions older than Emacs 27
+can have the @samp{Package-Requires} header split across multiple
+lines, like this:
+
+@smallexample
+@group
+;; Package-Requires: ((emacs "27.1")
+;;                    (compat "29.1.4.1"))
+@end group
+@end smallexample
+
+@noindent
+Note that with this format, you still need to start the list on the
+same line as @samp{Package-Requires}.
+
 The package code automatically defines a package named @samp{emacs}
 with the version number of the currently running Emacs.  This can be
 used to require a minimal version of Emacs for a package.
diff --git a/doc/misc/tramp.texi b/doc/misc/tramp.texi
index 2f2c166cf8c..801e4b931e2 100644
--- a/doc/misc/tramp.texi
+++ b/doc/misc/tramp.texi
@@ -2984,7 +2984,7 @@ connection cleanup or on Emacs exiting.
 @cindex rclone setup
 
 The default arguments of the @command{rclone} operations
-@command{mount}, @command{coopyto}, @command{moveto} and
+@command{mount}, @command{copyto}, @command{moveto} and
 @command{about} are declared in the variable @code{tramp-methods} as
 method specific parameters.  Usually, they don't need to be overwritten.
 
diff --git a/lisp/emacs-lisp/cl-lib.el b/lisp/emacs-lisp/cl-lib.el
index 42ff3e105c0..779f25df572 100644
--- a/lisp/emacs-lisp/cl-lib.el
+++ b/lisp/emacs-lisp/cl-lib.el
@@ -157,6 +157,7 @@ to an element already in the list stored in PLACE.
     `(cl-callf2 cl-adjoin ,x ,place ,@keys)))
 
 (defun cl--set-buffer-substring (start end val)
+  "Delete region from START to END and insert VAL."
   (save-excursion (delete-region start end)
                  (goto-char start)
                  (insert val)
@@ -194,6 +195,8 @@ to an element already in the list stored in PLACE.
 ;; the target form to return the values as a list.
 
 (defun cl--defalias (cl-f el-f &optional doc)
+  "Define function CL-F as definition EL-F.
+Like `defalias' but marks the alias itself as inlinable."
   (defalias cl-f el-f doc)
   (put cl-f 'byte-optimizer 'byte-compile-inline-expand))