Commit 3f86c085 authored by Paul Eggert's avatar Paul Eggert

Merge from trunk.

parents 1fd800e5 ad6042bb
......@@ -180,6 +180,18 @@
Use EMACS_INT, not EMACS_UINT, for sizes. The code works equally
well either way, and we prefer signed to unsigned.
2011-07-14 Paul Eggert <eggert@cs.ucla.edu>
Fix minor problems found by static checking.
* bidi.c (bidi_cache_size): Now EMACS_INT, not size_t.
(elsz): Now a signed constant, not a size_t var. We prefer signed
types to unsigned, to avoid integer comparison confusion. Without
this change, GCC 4.6.1 with -Wunsafe-loop-optimizations complains
"cannot optimize loop, the loop counter may overflow", a symptom
of the confusion.
* indent.c (Fvertical_motion): Mark locals as initialized.
* xdisp.c (reseat_to_string): Fix pointer signedness issue.
2011-07-14 Lars Magne Ingebrigtsen <larsi@gnus.org>
* data.c (Fcdr, Fcar): Revert the last change, since it didn't
......
......@@ -299,8 +299,8 @@ bidi_copy_it (struct bidi_it *to, struct bidi_it *from)
#define BIDI_CACHE_CHUNK 200
static struct bidi_it *bidi_cache;
static size_t bidi_cache_size = 0;
static size_t elsz = sizeof (struct bidi_it);
static EMACS_INT bidi_cache_size = 0;
enum { elsz = sizeof (struct bidi_it) };
static EMACS_INT bidi_cache_idx; /* next unused cache slot */
static EMACS_INT bidi_cache_last_idx; /* slot of last cache hit */
static EMACS_INT bidi_cache_start = 0; /* start of cache for this
......
......@@ -1985,7 +1985,7 @@ whether or not it is currently displayed in some window. */)
struct text_pos pt;
struct window *w;
Lisp_Object old_buffer;
EMACS_INT old_charpos, old_bytepos;
EMACS_INT old_charpos IF_LINT (= 0), old_bytepos IF_LINT (= 0);
struct gcpro gcpro1, gcpro2, gcpro3;
Lisp_Object lcols = Qnil;
double cols IF_LINT (= 0);
......
......@@ -5890,7 +5890,7 @@ reseat_to_string (struct it *it, const char *s, Lisp_Object string,
if (it->bidi_p)
{
it->bidi_it.string.lstring = Qnil;
it->bidi_it.string.s = s;
it->bidi_it.string.s = (const unsigned char *) s;
it->bidi_it.string.schars = it->end_charpos;
it->bidi_it.string.bufpos = 0;
it->bidi_it.string.from_disp_str = 0;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment