# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1225750599 -3600
# Node ID 5cf987b0f3a1da6e430113ac6e18ef2e10daad31
# Parent  057aaae0f53e825dc047312a273e0c31d3c34bde# Parent  6fccffd4059af4240926b7bb37c4bd7c3f3c1b47
Merge with stable

diff -r 057aaae0f53e -r 5cf987b0f3a1 hgkw/keyword.py
--- a/hgkw/keyword.py	Thu Oct 23 10:25:24 2008 +0200
+++ b/hgkw/keyword.py	Mon Nov 03 23:16:39 2008 +0100
@@ -503,15 +503,15 @@
         # shrink keywords read from working dir
         self.lines = kwt.shrinklines(self.fname, self.lines)
 
-    def kw_diff(orig, repo, node1=None, node2=None, match=None,
-                fp=None, changes=None, opts=None):
+    def kw_diff(orig, repo, node1=None, node2=None, match=None, changes=None,
+                opts=None):
         '''Monkeypatch patch.diff to avoid expansion except when
         comparing against working dir.'''
         if node2 is not None:
             kwt.matcher = util.never
         elif node1 is not None and node1 != repo['.'].node():
             kwt.restrict = True
-        orig(repo, node1, node2, match, fp, changes, opts)
+        return orig(repo, node1, node2, match, changes, opts)
 
     def kwweb_skip(orig, web, req, tmpl):
         '''Wraps webcommands.x turning off keyword expansion.'''