emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Emacs-diffs] master bf276b7: * lisp/dired-x.el (dired-guess-shell-alist


From: Juri Linkov
Subject: [Emacs-diffs] master bf276b7: * lisp/dired-x.el (dired-guess-shell-alist-default): Use git when possible.
Date: Mon, 5 Aug 2019 17:04:14 -0400 (EDT)

branch: master
commit bf276b792157023d2e469d6a32394cce9589e47e
Author: Juri Linkov <address@hidden>
Commit: Juri Linkov <address@hidden>

    * lisp/dired-x.el (dired-guess-shell-alist-default): Use git when possible.
    
    Check for Git backend and provide "git apply" for patch files (bug#36895).
---
 lisp/dired-x.el | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/lisp/dired-x.el b/lisp/dired-x.el
index 462fa4e..313a227 100644
--- a/lisp/dired-x.el
+++ b/lisp/dired-x.el
@@ -827,6 +827,7 @@ Also useful for `auto-mode-alist' like this:
 ;; install GNU zip's version of zcat.
 
 (autoload 'Man-support-local-filenames "man")
+(autoload 'vc-responsible-backend "vc")
 
 (defvar dired-guess-shell-alist-default
   (list
@@ -909,7 +910,10 @@ Also useful for `auto-mode-alist' like this:
         '(concat "znew" (if dired-guess-shell-gzip-quiet " -q")
                  " " dired-guess-shell-znew-switches))
 
-   '("\\.patch\\'" "cat * | patch")
+   (list "\\.patch\\'"
+         '(if (eq (ignore-errors (vc-responsible-backend default-directory)) 
'Git)
+              "cat * | git apply"
+            "cat * | patch"))
    (list "\\.patch\\.g?z\\'" "gunzip -qc * | patch"
         ;; Optional decompression.
         '(concat "gunzip" (if dired-guess-shell-gzip-quiet " -q")))



reply via email to

[Prev in Thread] Current Thread [Next in Thread]