[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r109868: Revert changes prompted only
From: |
Paul Eggert |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r109868: Revert changes prompted only by gcc -Wjump-misses-init. |
Date: |
Mon, 03 Sep 2012 12:36:09 -0700 |
User-agent: |
Bazaar (2.5.0) |
------------------------------------------------------------
revno: 109868
committer: Paul Eggert <address@hidden>
branch nick: trunk
timestamp: Mon 2012-09-03 12:36:09 -0700
message:
Revert changes prompted only by gcc -Wjump-misses-init.
modified:
src/ChangeLog
src/doc.c
src/regex.c
src/xdisp.c
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog 2012-09-03 09:22:43 +0000
+++ b/src/ChangeLog 2012-09-03 19:36:09 +0000
@@ -1,11 +1,7 @@
2012-09-03 Paul Eggert <address@hidden>
- 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 <address@hidden>
=== modified file 'src/doc.c'
--- a/src/doc.c 2012-09-03 09:22:43 +0000
+++ b/src/doc.c 2012-09-03 19:36:09 +0000
@@ -848,10 +848,9 @@
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;
=== modified file 'src/regex.c'
--- a/src/regex.c 2012-09-03 09:22:43 +0000
+++ b/src/regex.c 2012-09-03 19:36:09 +0000
@@ -5160,13 +5160,11 @@
{
/* 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)
=== modified file 'src/xdisp.c'
--- a/src/xdisp.c 2012-09-03 09:22:43 +0000
+++ b/src/xdisp.c 2012-09-03 19:36:09 +0000
@@ -13511,10 +13511,9 @@
}
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. */
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r109868: Revert changes prompted only by gcc -Wjump-misses-init.,
Paul Eggert <=