--- a/hgkw/keyword.py	Fri Jan 12 13:58:59 2007 +0100
+++ b/hgkw/keyword.py	Sat Jan 13 13:27:13 2007 +0100
@@ -60,9 +60,9 @@
                 break
     return candidates
 
-def utc(hgdate):
+def utcdate(date):
     '''Returns hgdate in cvs-like UTC format.'''
-    return time.strftime('%Y/%m/%d %H:%M:%S', time.gmtime(hgdate[0]))
+    return time.strftime('%Y/%m/%d %H:%M:%S', time.gmtime(date[0]))
 
 
 class kwfilectx(context.filectx):
@@ -76,7 +76,7 @@
     def Author(self):
         return util.shortuser(self.user())
     def Date(self):
-        return utc(self.date())
+        return utcdate(self.date())
     def RCSFile(self):
         return os.path.basename(self._path)+',v'
     def Source(self):
@@ -134,7 +134,7 @@
             if self.iskwcandidate(text):
                 text = re_kw.sub(r'$\1$', text)
             return super(kwfilelog, self).add(text,
-                    meta, tr, link, p1=None, p2=None)
+                    meta, tr, link, p1=p1, p2=p2)
 
         def cmp(self, node, text):
             '''Removes keyword substitutions for comparison.'''