master d14d86696e 2/2: Merge from origin/emacs-28

[Stefan Kangas]

branch: master
commit d14d86696e0f43e872291f592727538193153a51
Merge: f7c4a62048 afdf72eeb2
Author: Stefan Kangas <stefan@marxist.se>
Commit: Stefan Kangas <stefan@marxist.se>

    Merge from origin/emacs-28
    
    afdf72eeb2 Fix bug#55274
    5bfac7c774 Provide reference for OTF tags in the ELisp manual
---
 doc/lispref/display.texi | 5 ++++-
 lisp/dired-aux.el        | 3 ++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/doc/lispref/display.texi b/doc/lispref/display.texi
index 390d165025..9650d22790 100644
--- a/doc/lispref/display.texi
+++ b/doc/lispref/display.texi
@@ -4021,7 +4021,10 @@ required; and @code{gpos} is a list of OpenType GPOS 
feature tag
 symbols, or @code{nil} if none is required.  If @code{gsub} or
 @code{gpos} is a list, a @code{nil} element in that list means that
 the font must not match any of the remaining tag symbols.  The
-@code{gpos} element may be omitted.
+@code{gpos} element may be omitted.  For the list of OpenType script,
+language, and feature tags, see
+@uref{https://docs.microsoft.com/en-us/typography/opentype/spec/ttoreg,
+the list of registered OTF tags}.
 
 @item :type
 @cindex font backend
diff --git a/lisp/dired-aux.el b/lisp/dired-aux.el
index ae033618c2..64cdab28f9 100644
--- a/lisp/dired-aux.el
+++ b/lisp/dired-aux.el
@@ -1264,7 +1264,8 @@ and `dired-compress-files-alist'."
            (when (zerop
                   (dired-shell-command
                    (format-spec (cdr rule)
-                                `((?o . ,(shell-quote-argument out-file))
+                                `((?o . ,(shell-quote-argument
+                                          (file-local-name out-file)))
                                   (?i . ,(mapconcat
                                           (lambda (in-file)
                                             (shell-quote-argument