2 files changed, 8 insertions, 6 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 3b099c02c25..2c8a95c3571 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,6 +1,7 @@
 2011-04-03  Paul Eggert  <eggert@cs.ucla.edu>
 
         * search.c (boyer_moore, wordify): Remove vars set but not used.
+        (wordify): Omit three unnecessary tests.
 
         * indent.c (MULTIBYTE_BYTES_WIDTH): Don't compute wide_column.
         All callers changed.  This avoids the need for an unused var.
diff --git a/src/search.c b/src/search.c
index 4358bf2186a..fa44e1300d7 100644
--- a/src/search.c
+++ b/src/search.c
@@ -2105,7 +2105,7 @@ wordify (Lisp_Object string, int lax)
       if (SYNTAX (c) != Sword)
         {
           punct_count++;
-          if (i > 0 && SYNTAX (prev_c) == Sword)
+          if (SYNTAX (prev_c) == Sword)
             word_count++;
         }
 
@@ -2118,10 +2118,11 @@ wordify (Lisp_Object string, int lax)
       whitespace_at_end = 0;
     }
   else
-    whitespace_at_end = 1;
-
-  if (!word_count)
-    return empty_unibyte_string;
+    {
+      whitespace_at_end = 1;
+      if (!word_count)
+        return empty_unibyte_string;
+    }
 
   adjust = - punct_count + 5 * (word_count - 1)
     + ((lax && !whitespace_at_end) ? 2 : 4);
@@ -2149,7 +2150,7 @@ wordify (Lisp_Object string, int lax)
           memcpy (o, SDATA (string) + i_byte_orig, i_byte - i_byte_orig);
           o += i_byte - i_byte_orig;
         }
-      else if (i > 0 && SYNTAX (prev_c) == Sword && --word_count)
+      else if (SYNTAX (prev_c) == Sword && --word_count)
         {
           *o++ = '\\';
           *o++ = 'W';