# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1271145951 -7200
# Node ID 28713701448806a3d8995e9277825d9753cd920d
# Parent  2f341cf2268dfbdf1139c5abe9da612bba3aa08a# Parent  d01d3a15995ad2c7d71fe4a0bf56323cbca8b066
Merge with stable

diff -r d01d3a15995a -r 287137014488 hgkw/keyword.py
--- a/hgkw/keyword.py	Mon Apr 12 17:21:30 2010 -0700
+++ b/hgkw/keyword.py	Tue Apr 13 10:05:51 2010 +0200
@@ -322,11 +322,7 @@
 
     uisetup(ui)
     reposetup(ui, repo)
-    for k, v in ui.configitems('extensions'):
-        if k.endswith('keyword'):
-            extension = '%s = %s' % (k, v)
-            break
-    ui.write('[extensions]\n%s\n' % extension)
+    ui.write('[extensions]\nkeyword =\n')
     demoitems('keyword', ui.configitems('keyword'))
     demoitems('keywordmaps', kwmaps.iteritems())
     keywords = '$' + '$\n$'.join(sorted(kwmaps.keys())) + '$\n'
diff -r d01d3a15995a -r 287137014488 tests/test-keyword.out
--- a/tests/test-keyword.out	Mon Apr 12 17:21:30 2010 -0700
+++ b/tests/test-keyword.out	Tue Apr 13 10:05:51 2010 +0200
@@ -1,6 +1,6 @@
 % hg kwdemo
 [extensions]
-keyword = 
+keyword =
 [keyword]
 demo.txt = 
 [keywordmaps]
@@ -21,7 +21,7 @@
 $Revision: xxxxxxxxxxxx $
 $Source: /TMP/demo.txt,v $
 [extensions]
-keyword = 
+keyword =
 [keyword]
 demo.txt = 
 [keywordmaps]
@@ -206,7 +206,7 @@
 % custom keyword expansion
 % try with kwdemo
 [extensions]
-keyword = 
+keyword =
 [keyword]
 * = 
 b = ignore