From da8b85b577d79dd45632d9c40a1336b58b955812 Mon Sep 17 00:00:00 2001
From: Jeremy Bryant <jb@jeremybryant.net>
Date: Sun, 29 Oct 2023 21:56:54 +0000
Subject: [PATCH 1/4] Add two docstrings in cl-lib.el

* lisp/emacs-lisp/cl-lib.el (cl--set-buffer-substring)
(cl--defalias): Add docstrings.  (Bug#66828)
---
 lisp/emacs-lisp/cl-lib.el | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/lisp/emacs-lisp/cl-lib.el b/lisp/emacs-lisp/cl-lib.el
index 152a1fe9434..96197d43c3d 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)
@@ -183,6 +184,9 @@ 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.
+
+For example, (cl--defalias 'cl-first 'car)."
   (defalias cl-f el-f doc)
   (put cl-f 'byte-optimizer 'byte-compile-inline-expand))
 

From a64336cbb9c95663067da9a2a09a9c281e602161 Mon Sep 17 00:00:00 2001
From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Mon, 30 Oct 2023 18:50:47 -0400
Subject: [PATCH 2/4] * lisp/emacs-lisp/cl-lib.el (cl--defalias): Improve&fix
 docstring

---
 lisp/emacs-lisp/cl-lib.el | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/lisp/emacs-lisp/cl-lib.el b/lisp/emacs-lisp/cl-lib.el
index 96197d43c3d..ac986adc722 100644
--- a/lisp/emacs-lisp/cl-lib.el
+++ b/lisp/emacs-lisp/cl-lib.el
@@ -185,8 +185,7 @@ to an element already in the list stored in PLACE.
 
 (defun cl--defalias (cl-f el-f &optional doc)
   "Define function CL-F as definition EL-F.
-
-For example, (cl--defalias 'cl-first 'car)."
+Like `defalias' but marks the alias itself as inlinable."
   (defalias cl-f el-f doc)
   (put cl-f 'byte-optimizer 'byte-compile-inline-expand))
 

From c1778432790f140ba8ab942c2cdf7fcb2834188a Mon Sep 17 00:00:00 2001
From: Michael Albinus <michael.albinus@gmx.de>
Date: Tue, 31 Oct 2023 17:32:23 +0100
Subject: [PATCH 3/4] ; * doc/misc/tramp.texi (FUSE setup): Fix typo.

---
 doc/misc/tramp.texi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/misc/tramp.texi b/doc/misc/tramp.texi
index df966040a1b..0571c91115c 100644
--- a/doc/misc/tramp.texi
+++ b/doc/misc/tramp.texi
@@ -2960,7 +2960,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.
 

From 196def4fa6411a32e26aa8e589a588f9cd0fbc95 Mon Sep 17 00:00:00 2001
From: Eli Zaretskii <eliz@gnu.org>
Date: Sat, 4 Nov 2023 09:59:45 +0200
Subject: [PATCH 4/4] Fix description of 'Package-Requires' library header

* doc/lispref/tips.texi (Library Headers): Update the description
of the 'Package-Requires' header.  (Bug#66677)
---
 doc/lispref/tips.texi | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/doc/lispref/tips.texi b/doc/lispref/tips.texi
index f594d684338..f760b2554f0 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.