dired-copy-filename-as-kill: Support project-relative names

* lisp/dired.el (dired-copy-filename-as-kill): Support new value
of ARG, to mean file name relative to project root (bug#76792).

* doc/emacs/dired.texi (Misc Dired Features): Mention it.

* etc/NEWS: Same.

(cherry picked from commit af81b3af4ce99c664b040313b548910770bc5854)

diff --git a/doc/emacs/dired.texi b/doc/emacs/dired.texi
index f52b001c1216bcea5fb00e5d28222017a07e1c06..0d7d7c4cf261f41ef44eab3586578de3d2a00855 100644 (file)
--- a/doc/emacs/dired.texi
+++ b/doc/emacs/dired.texi
@@ -1868,8 +1868,9 @@ names of the marked (or next @var{n}) files into the kill ring, as if
 you had killed them with @kbd{C-w}.  The names are separated by a
 space.
 
-  With a zero prefix argument, this uses the absolute file name of
-each marked file.  With just @kbd{C-u} as the prefix argument, it uses
+  With a zero prefix argument, this uses the absolute file name of each
+marked file.  With prefix value 1, it uses names relative to the
+project root.  With just @kbd{C-u} as the prefix argument, it uses
 file names relative to the Dired buffer's default directory.  (This
 can still contain slashes if in a subdirectory.)  As a special case,
 if point is on a directory header line, @kbd{w} gives you the absolute

diff --git a/lisp/dired.el b/lisp/dired.el
index 8ffa9b1db1896a55be7aa6caf0c7aed2eb2dce34..b5b4ba14920cc98f4ee5b921bf9b928be3f1f409 100644 (file)
--- a/lisp/dired.el
+++ b/lisp/dired.el
@@ -3474,6 +3474,7 @@ be quoted (with double quotes).  (When there's a single file, no
 quoting is done.)
 
 With a zero prefix arg, use the absolute file name of each marked file.
+With a prefix value 1, use the names relative to the current project root.
 With \\[universal-argument], use the file name relative to the Dired buffer's
 `default-directory'.  (This still may contain slashes if in a subdirectory.)
 
@@ -3485,8 +3486,13 @@ You can then feed the file name(s) to other commands with \\[yank]."
   (let* ((files
           (or (ensure-list (dired-get-subdir))
               (if arg
-                  (cond ((zerop (prefix-numeric-value arg))
+                  (cond ((eql 0 arg)
                          (dired-get-marked-files))
+                        ((eql 1 arg)
+                         (let ((root (project-root (project-current t))))
+                           (mapcar
+                            (lambda (file) (file-relative-name file root))
+                            (dired-get-marked-files))))
                         ((consp arg)
                          (dired-get-marked-files t))
                         (t