Subject: bug#36895: closed (Re: bug#36895: Patch in dired-guess-shell-alist-default)

From: [email-masked] (GNU bug Tracking System)
Date: Mon, 05 Aug 2019 21:19:03 +0000

Your bug report

#36895: Patch in dired-guess-shell-alist-default

which was filed against the emacs package, has been closed.

The explanation is attached below, along with your original report.
If you require more details, please reply to [email-masked].

-- 
36895: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=36895
GNU Bug Tracking System
Contact [email-masked] with problems

Subject: Re: bug#36895: Patch in dired-guess-shell-alist-default
From: Juri Linkov <[email-masked]>
To: Eli Zaretskii <[email-masked]>
Cc: [email-masked]
Date: Tue, 06 Aug 2019 00:04:40 +0300
List-Id: <debbugs-submit.debbugs.gnu.org>

>> >> Isn't "git apply" used more often nowadays than "patch"?
>> >
>> > No, not here.  "git apply" is only relevant for when working in a Git
>> > repository.
>> >
>> > We could perhaps make this customizable, or maybe even make Emacs
>> > intuit the right command looking at the current buffer, though.
>> 
>> Yes, this would be more appropriate:
>
> Thanks, LGTM.

Pushed to master and closed.

Subject: Patch in dired-guess-shell-alist-default
From: Juri Linkov <[email-masked]>
To: [email-masked]
Date: Fri, 02 Aug 2019 00:42:32 +0300
List-Id: <debbugs-submit.debbugs.gnu.org>

Tags: patch

Isn't "git apply" used more often nowadays than "patch"?
If yes, then I propose this patch:

diff --git a/lisp/dired-x.el b/lisp/dired-x.el
index 462fa4ee15..3b3c0aeaf3 100644
--- a/lisp/dired-x.el
+++ b/lisp/dired-x.el
@@ -909,11 +909,11 @@ dired-guess-shell-alist-default
 	 '(concat "znew" (if dired-guess-shell-gzip-quiet " -q")
 		  " " dired-guess-shell-znew-switches))
 
-   '("\\.patch\\'" "cat * | patch")
-   (list "\\.patch\\.g?z\\'" "gunzip -qc * | patch"
+   '("\\.patch\\'" "cat * | patch" "cat * | git apply")
+   (list "\\.patch\\.g?z\\'" "gunzip -qc * | patch" "gunzip -qc * | git apply"
 	 ;; Optional decompression.
 	 '(concat "gunzip" (if dired-guess-shell-gzip-quiet " -q")))
-   (list "\\.patch\\.Z\\'" "zcat * | patch"
+   (list "\\.patch\\.Z\\'" "zcat * | patch" "zcat * | git apply"
 	 ;; Optional conversion to gzip format.
 	 '(concat "znew" (if dired-guess-shell-gzip-quiet " -q")
 		  " " dired-guess-shell-znew-switches))