33 lines
1.1 KiB
Diff
33 lines
1.1 KiB
Diff
|
From: Leonid Movshovich <event.riga@gmail.com>
|
||
|
|
Date: Sun, 18 Jan 2015 10:04:52 +0100
|
||
|
|
Subject: quilt-el: Fix tramp support
|
||
|
|
Upstream: Committed (7be8f49a95a528e4c46df0cfe26877457c95ac0e)
|
||
|
|
|
||
|
|
quilt-find-dir goes to endless recursion if root is not '/'. This
|
||
|
|
holds for files opened with tramp for example.
|
||
|
|
|
||
|
|
Reviewed and tested by Satoru Takeuchi.
|
||
|
|
|
||
|
|
diff --git a/lib/quilt.el b/lib/quilt.el
|
||
|
|
index 6fe1c32..0a57b05 100644
|
||
|
|
--- a/lib/quilt.el
|
||
|
|
+++ b/lib/quilt.el
|
||
|
|
@@ -45,14 +45,14 @@
|
||
|
|
(or (getenv "QUILT_PATCHES")
|
||
|
|
"patches")))
|
||
|
|
|
||
|
|
-(defun quilt-find-dir (fn)
|
||
|
|
+(defun quilt-find-dir (fn &optional prefn)
|
||
|
|
"Return the top level dir of quilt from FN."
|
||
|
|
- (if (or (not fn) (equal fn "/"))
|
||
|
|
+ (if (or (not fn) (equal fn "/") (equal fn prefn))
|
||
|
|
nil
|
||
|
|
(let ((d (file-name-directory fn)))
|
||
|
|
(if (file-accessible-directory-p (concat d "/.pc"))
|
||
|
|
d
|
||
|
|
- (quilt-find-dir (directory-file-name d))))))
|
||
|
|
+ (quilt-find-dir (directory-file-name d) d)))))
|
||
|
|
|
||
|
|
(defun quilt-dir (&optional fn)
|
||
|
|
"Return the top level dir of quilt from FN. FN is just a hint and find from other way if FN is nil."
|