# HG changeset patch
# User Kevin Bullock <kbullock@ringworld.org>
# Date 1378530516 18000
# Node ID 591cbff13a7feae0104bb2709a42a0be44cc029f
# Parent  79792c8ea6dab5bc54f3c13357531c63a984cb4a# Parent  26ddce1a2a55809d430498f4ed1fa9594c390885
merge with stable

diff -r 79792c8ea6da -r 591cbff13a7f mercurial/revset.py
--- a/mercurial/revset.py	Thu Aug 15 13:42:56 2013 -0500
+++ b/mercurial/revset.py	Sat Sep 07 00:08:36 2013 -0500
@@ -910,8 +910,8 @@
     l = []
     for r in subset:
         c = repo[r]
-        t = " ".join(c.files() + [c.user(), c.description()])
-        if kw in encoding.lower(t):
+        if util.any(kw in encoding.lower(t)
+                    for t in c.files() + [c.user(), c.description()]):
             l.append(r)
     return l
 
diff -r 79792c8ea6da -r 591cbff13a7f tests/test-revset.t
--- a/tests/test-revset.t	Thu Aug 15 13:42:56 2013 -0500
+++ b/tests/test-revset.t	Sat Sep 07 00:08:36 2013 -0500
@@ -328,6 +328,7 @@
   7
   $ log 'keyword(issue)'
   6
+  $ log 'keyword("test a")'
   $ log 'limit(head(), 1)'
   0
   $ log 'matching(6)'