diff --git a/src/ChangeLog b/src/ChangeLog
index 893ad867c2a..af53b77a622 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2014-10-16  Eli Zaretskii  <eliz@gnu.org>
+
+	* bidi.c (bidi_find_bracket_pairs): Avoid a loop that does nothing
+	useful.
+
 2014-10-15  Paul Eggert  <eggert@cs.ucla.edu>
 
 	* bidi.c (bidi_find_bracket_pairs): Initialize local var.
diff --git a/src/bidi.c b/src/bidi.c
index 67eb59e7899..bbafc785e7b 100644
--- a/src/bidi.c
+++ b/src/bidi.c
@@ -2472,8 +2472,11 @@ bidi_find_bracket_pairs (struct bidi_it *bidi_it)
 		default:
 		  break;
 		}
-	      for (sp = bpa_sp; sp >= 0; sp--)
-		bpa_stack[sp].flags |= flag;
+	      if (flag)
+		{
+		  for (sp = bpa_sp; sp >= 0; sp--)
+		    bpa_stack[sp].flags |= flag;
+		}
 	    }
 	  old_sidx = bidi_it->stack_idx;
 	  type = bidi_resolve_weak (bidi_it);