master 76ee4dc823: Merge from origin/emacs-28

[Stefan Kangas]

branch: master
commit 76ee4dc82375893a5c59c63acda43af27879e54a
Merge: 5b90b05e42 57c112cfe5
Author: Stefan Kangas <stefan@marxist.se>
Commit: Stefan Kangas <stefan@marxist.se>

    Merge from origin/emacs-28
    
    57c112cfe5 ; * doc/emacs/files.texi (Comparing Files): Fix a reference.
    bdeac2d5af ; Fix a typo in filesets.el's doc string
---
 doc/emacs/files.texi | 4 ++--
 lisp/filesets.el     | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/doc/emacs/files.texi b/doc/emacs/files.texi
index c5cb6fd17b..ffd8079fc1 100644
--- a/doc/emacs/files.texi
+++ b/doc/emacs/files.texi
@@ -1467,8 +1467,8 @@ specified buffers.
   The command @kbd{M-x compare-windows} compares the text in the
 current window with that in the window that was the selected window
 before you selected the current one.  (For more information about
-windows in Emacs, @ref{Windows}.)  Comparison starts at point in each
-window, after pushing each initial point value on the mark ring
+windows in Emacs, @pxref{Windows}.)  Comparison starts at point in
+each window, after pushing each initial point value on the mark ring
 (@pxref{Mark Ring}) in its respective buffer.  Then it moves point
 forward in each window, one character at a time, until it reaches
 characters that don't match.  Then the command exits.
diff --git a/lisp/filesets.el b/lisp/filesets.el
index 0bc44ecd91..83a914d58c 100644
--- a/lisp/filesets.el
+++ b/lisp/filesets.el
@@ -1761,7 +1761,7 @@ Use LOOKUP-NAME for deducing the save-function, if 
provided."
 
 (defun filesets-add-buffer (&optional name buffer)
   "Add BUFFER (or current buffer) to the fileset called NAME.
-User will be queried, if no fileset name is provided."
+If no fileset name is provided, prompt for NAME."
   (interactive)
   (let* ((buffer (or buffer
                     (current-buffer)))
@@ -1796,8 +1796,8 @@ User will be queried, if no fileset name is provided."
            (message "Filesets: Can't add `%s' to fileset `%s'" this name)))))))
 
 (defun filesets-remove-buffer (&optional name buffer)
-  "Remove BUFFER (or current buffer) to fileset NAME.
-User will be queried, if no fileset name is provided."
+  "Remove BUFFER (or current buffer) from the fileset called NAME.
+If no fileset name is provided, prompt for NAME."
   (interactive)
   (let* ((buffer (or buffer
                     (current-buffer)))