summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorEli Zaretskii <eliz@gnu.org>2011-07-01 11:45:24 +0300
committerEli Zaretskii <eliz@gnu.org>2011-07-01 11:45:24 +0300
commit7e2ad32c19096fb9a86fbb88f7e7b1ed90a332e9 (patch)
treec6b99e45b004ecf2a99a3cc5c6efe988cef74d93 /src
parenta1344e7d125a094bf49460f1a356f98fa86a8f9f (diff)
downloademacs-7e2ad32c19096fb9a86fbb88f7e7b1ed90a332e9.tar.gz
Fix typos in comments. Use xassert.
Diffstat (limited to 'src')
-rw-r--r--src/bidi.c14
1 files changed, 6 insertions, 8 deletions
diff --git a/src/bidi.c b/src/bidi.c
index 0cd8deb47c0..5c9239d60f0 100644
--- a/src/bidi.c
+++ b/src/bidi.c
@@ -240,8 +240,7 @@ bidi_push_embedding_level (struct bidi_it *bidi_it,
int level, bidi_dir_t override)
{
bidi_it->stack_idx++;
- if (bidi_it->stack_idx >= BIDI_MAXLEVEL)
- abort ();
+ xassert (bidi_it->stack_idx < BIDI_MAXLEVEL);
bidi_it->level_stack[bidi_it->stack_idx].level = level;
bidi_it->level_stack[bidi_it->stack_idx].override = override;
}
@@ -556,9 +555,9 @@ static int bidi_cache_sp;
/* Push the bidi iterator state in preparation for reordering a
different object, e.g. display string found at certain buffer
- position. Pushing the bidi iterator boils to saving its entire
- state on the cache and starting a new cache "stacked" on top of the
- current cache. */
+ position. Pushing the bidi iterator boils down to saving its
+ entire state on the cache and starting a new cache "stacked" on top
+ of the current cache. */
void
bidi_push_it (struct bidi_it *bidi_it)
{
@@ -568,8 +567,7 @@ bidi_push_it (struct bidi_it *bidi_it)
memcpy (&bidi_cache[bidi_cache_idx++], bidi_it, sizeof (struct bidi_it));
/* Push the current cache start onto the stack. */
- if (bidi_cache_sp >= IT_STACK_SIZE)
- abort ();
+ xassert (bidi_cache_sp < IT_STACK_SIZE);
bidi_cache_start_stack[bidi_cache_sp++] = bidi_cache_start;
/* Start a new level of cache, and make it empty. */
@@ -2034,7 +2032,7 @@ bidi_move_to_visually_next (struct bidi_it *bidi_it)
}
/* The code below can call eval, and thus cause GC. If we are
- iterating a Lisp string, make sure it won't GCed. */
+ iterating a Lisp string, make sure it won't be GCed. */
if (STRINGP (bidi_it->string.lstring))
GCPRO1 (bidi_it->string.lstring);