]> git.eshelyaron.com Git - emacs.git/commitdiff
Fix some regressions introduced by the previous dired-aux change
authorLars Ingebrigtsen <larsi@gnus.org>
Tue, 18 May 2021 15:49:05 +0000 (17:49 +0200)
committerLars Ingebrigtsen <larsi@gnus.org>
Tue, 18 May 2021 15:49:10 +0000 (17:49 +0200)
* lisp/dired-aux.el (dired-compress-file): Check that the file
we're compressing exists.  Also work outside the current directory.

lisp/dired-aux.el

index 2e4ff934590c2bf1f0569fa3d7a12fd87aa42b6f..eb43ab187d59a43c0162cbfc7cc00257beea0171 100644 (file)
@@ -1334,7 +1334,8 @@ Return nil if no change in files."
                        (user-error "No compression rule found for suffix %s, \
 see `dired-compress-file-alist' for the supported suffixes list."
                                    dired-compress-file-default-suffix)
-                     (and (or (not (file-exists-p out-name))
+                     (and (file-exists-p file)
+                          (or (not (file-exists-p out-name))
                               (y-or-n-p
                                (format
                                 "File %s already exists.  Really compress? "
@@ -1343,8 +1344,7 @@ see `dired-compress-file-alist' for the supported suffixes list."
                            (replace-regexp-in-string
                             "%o" (shell-quote-argument out-name)
                             (replace-regexp-in-string
-                             "%i" (shell-quote-argument
-                                   (file-name-nondirectory file))
+                             "%i" (shell-quote-argument file)
                              (cdr rule)
                              nil t)
                             nil t))