Commit d42f4f0f authored by Paul Eggert's avatar Paul Eggert

Revert changes prompted only by gcc -Wjump-misses-init.

parent 79a7bafe
2012-09-03 Paul Eggert <eggert@cs.ucla.edu>
Fix minor problems found by static checking.
Fix minor problem found by static checking.
* buffer.c (Fdelete_all_overlays): Return nil.
* doc.c (Fsubstitute_command_keys):
* regex.c (WEAK_ALIAS):
* xdisp.c (redisplay_internal):
Move initialization down, to pacify GCC 4.7.1 -Wjump-misses-init.
2012-09-03 Martin Rudalics <rudalics@gmx.at>
......
......@@ -848,10 +848,9 @@ Otherwise, return a new string, without any text properties. */)
struct buffer *oldbuf;
ptrdiff_t start_idx;
/* This is for computing the SHADOWS arg for describe_map_tree. */
Lisp_Object active_maps;
Lisp_Object active_maps = Fcurrent_active_maps (Qnil, Qnil);
Lisp_Object earlier_maps;
active_maps = Fcurrent_active_maps (Qnil, Qnil);
changed = 1;
strp += 2; /* skip \{ or \< */
start = strp;
......
......@@ -5160,13 +5160,11 @@ re_match_2_internal (struct re_pattern_buffer *bufp, const re_char *string1,
{
/* 1 if this match ends in the same string (string1 or string2)
as the best previous match. */
boolean same_str_p;
boolean same_str_p = (FIRST_STRING_P (match_end)
== FIRST_STRING_P (d));
/* 1 if this match is the best seen so far. */
boolean best_match_p;
same_str_p = (FIRST_STRING_P (match_end)
== FIRST_STRING_P (d));
/* AIX compiler got confused when this was combined
with the previous declaration. */
if (same_str_p)
......
......@@ -13511,10 +13511,9 @@ redisplay_internal (void)
}
else if (FRAME_VISIBLE_P (sf) && !FRAME_OBSCURED_P (sf))
{
Lisp_Object mini_window;
Lisp_Object mini_window = FRAME_MINIBUF_WINDOW (sf);
struct frame *mini_frame;
mini_window = FRAME_MINIBUF_WINDOW (sf);
displayed_buffer = XBUFFER (XWINDOW (selected_window)->buffer);
/* Use list_of_error, not Qerror, so that
we catch only errors and don't run the debugger. */
......
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