# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1305672255 -7200
# Node ID d93ca857e4bb1a678c754d4fb922e98acc69e46c
# Parent  65b0318770d19d9fbc15b60363255c54984995e7# Parent  dd81191ffac3e59203dc9dc0d46c0ca34b2b751f
Merge with stable

diff -r 65b0318770d1 -r d93ca857e4bb hgkw/keyword.py
--- a/hgkw/keyword.py	Tue May 17 13:45:25 2011 +0200
+++ b/hgkw/keyword.py	Wed May 18 00:44:15 2011 +0200
@@ -595,11 +595,11 @@
                 wlock.release()
 
     # monkeypatches
-    def kwpatchfile_init(orig, self, ui, fname, opener,
+    def kwpatchfile_init(orig, self, ui, fname, backend,
                          missing=False, eolmode=None):
         '''Monkeypatch/wrap patch.patchfile.__init__ to avoid
         rejects or conflicts due to expanded keywords in working dir.'''
-        orig(self, ui, fname, opener, missing, eolmode)
+        orig(self, ui, fname, backend, missing, eolmode)
         # shrink keywords read from working dir
         self.lines = kwt.shrinklines(self.fname, self.lines)