[Emacs-diffs] /srv/bzr/emacs/trunk r109864: Fix minor problems found by static checking.

[Paul Eggert]

------------------------------------------------------------
revno: 109864
committer: Paul Eggert <address@hidden>
branch nick: trunk
timestamp: Mon 2012-09-03 02:22:43 -0700
message:
  Fix minor problems 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.
modified:
  src/ChangeLog
  src/buffer.c
  src/doc.c
  src/regex.c
  src/xdisp.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2012-09-03 08:54:25 +0000
+++ b/src/ChangeLog     2012-09-03 09:22:43 +0000
@@ -1,3 +1,12 @@
+2012-09-03  Paul Eggert  <address@hidden>
+
+       Fix minor problems 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>
 
        * buffer.c (Fdelete_all_overlays): New function.

=== modified file 'src/buffer.c'
--- a/src/buffer.c      2012-09-03 08:54:25 +0000
+++ b/src/buffer.c      2012-09-03 09:22:43 +0000
@@ -4091,6 +4091,7 @@
     }
 
   delete_all_overlays (buf);
+  return Qnil;
 }
 
 /* Overlay dissection functions.  */

=== modified file 'src/doc.c'
--- a/src/doc.c 2012-09-02 16:56:31 +0000
+++ b/src/doc.c 2012-09-03 09:22:43 +0000
@@ -848,9 +848,10 @@
          struct buffer *oldbuf;
          ptrdiff_t start_idx;
          /* This is for computing the SHADOWS arg for describe_map_tree.  */
-         Lisp_Object active_maps = Fcurrent_active_maps (Qnil, Qnil);
+         Lisp_Object active_maps;
          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-08-14 17:45:25 +0000
+++ b/src/regex.c       2012-09-03 09:22:43 +0000
@@ -5160,11 +5160,13 @@
            {
              /* 1 if this match ends in the same string (string1 or string2)
                 as the best previous match.  */
-             boolean same_str_p = (FIRST_STRING_P (match_end)
-                                   == FIRST_STRING_P (d));
+             boolean same_str_p;
              /* 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-02 17:10:35 +0000
+++ b/src/xdisp.c       2012-09-03 09:22:43 +0000
@@ -13511,9 +13511,10 @@
     }
   else if (FRAME_VISIBLE_P (sf) && !FRAME_OBSCURED_P (sf))
     {
-      Lisp_Object mini_window = FRAME_MINIBUF_WINDOW (sf);
+      Lisp_Object mini_window;
       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.  */