aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEli Zaretskii2011-08-05 17:08:16 +0300
committerEli Zaretskii2011-08-05 17:08:16 +0300
commitec7cc85b3974f570965807203360dfa86069a136 (patch)
tree6f49fc648df5bfa274dff46ff841988ce101529c
parent5009803bda518652cc6f4b9fba02c0aed185c2a3 (diff)
downloademacs-ec7cc85b3974f570965807203360dfa86069a136.tar.gz
emacs-ec7cc85b3974f570965807203360dfa86069a136.zip
Make bidi_cache_total_alloc static.
src/bidi.c <bidi_cache_total_alloc>: Now static. (bidi_initialize): Initialize bidi_cache_total_alloc.
-rw-r--r--src/ChangeLog3
-rw-r--r--src/bidi.c3
2 files changed, 5 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 3ac958e0311..c6484b48de4 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,8 @@
12011-08-05 Eli Zaretskii <eliz@gnu.org> 12011-08-05 Eli Zaretskii <eliz@gnu.org>
2 2
3 * bidi.c <bidi_cache_total_alloc>: Now static.
4 (bidi_initialize): Initialize bidi_cache_total_alloc.
5
3 *xdisp.c (display_line): Release buffer allocated for shelved bidi 6 *xdisp.c (display_line): Release buffer allocated for shelved bidi
4 cache. (Bug#9221) 7 cache. (Bug#9221)
5 8
diff --git a/src/bidi.c b/src/bidi.c
index 00a6aeef954..0db144bea6c 100644
--- a/src/bidi.c
+++ b/src/bidi.c
@@ -620,7 +620,7 @@ bidi_pop_it (struct bidi_it *bidi_it)
620 bidi_cache_last_idx = -1; 620 bidi_cache_last_idx = -1;
621} 621}
622 622
623ptrdiff_t bidi_cache_total_alloc; 623static ptrdiff_t bidi_cache_total_alloc;
624 624
625/* Stash away a copy of the cache and its control variables. */ 625/* Stash away a copy of the cache and its control variables. */
626void * 626void *
@@ -768,6 +768,7 @@ bidi_initialize (void)
768 staticpro (&paragraph_separate_re); 768 staticpro (&paragraph_separate_re);
769 769
770 bidi_cache_sp = 0; 770 bidi_cache_sp = 0;
771 bidi_cache_total_alloc = 0;
771 772
772 bidi_initialized = 1; 773 bidi_initialized = 1;
773} 774}