[Emacs-diffs] /srv/bzr/emacs/trunk r99975: Declarations before code (Bug#5993).

[Jan D.]

------------------------------------------------------------
revno: 99975
committer: Jan D. <address@hidden>
branch nick: trunk
timestamp: Wed 2010-04-21 18:13:55 +0200
message:
  Declarations before code (Bug#5993).
  
  * data.c (make_blv): Declarations before code (Bug#5993).
  
  * xlwmenu.c (expose_cb):
  * lwlib-Xaw.c (fill_xft_data): Declarations before code (Bug#5993).
modified:
  lwlib/ChangeLog
  lwlib/lwlib-Xaw.c
  lwlib/xlwmenu.c
  src/ChangeLog
  src/data.c

=== modified file 'lwlib/ChangeLog'
--- a/lwlib/ChangeLog   2010-04-17 18:18:12 +0000
+++ b/lwlib/ChangeLog   2010-04-21 16:13:55 +0000
@@ -1,3 +1,8 @@
+2010-04-21  Jan Djärv  <address@hidden>
+
+       * xlwmenu.c (expose_cb):
+       * lwlib-Xaw.c (fill_xft_data): Declarations before code.
+
 2010-04-17  Jan Djärv  <address@hidden>
 
        * xlwmenu.c: Include Shell.h, remove duplicate declaration of

=== modified file 'lwlib/lwlib-Xaw.c'
--- a/lwlib/lwlib-Xaw.c 2010-04-11 18:25:09 +0000
+++ b/lwlib/lwlib-Xaw.c 2010-04-21 16:13:55 +0000
@@ -150,12 +150,12 @@
 static void
 fill_xft_data (struct widget_xft_data *data, Widget widget, XftFont *font)
 {
+  Pixel bg, fg;
+  XColor colors[2];
+  int screen = XScreenNumberOfScreen (XtScreen (widget));
+
   data->widget = widget;
   data->xft_font = font;
-  Pixel bg, fg;
-  XColor colors[2];
-  int screen = XScreenNumberOfScreen (XtScreen (widget));
-
   XtVaGetValues (widget,
                  XtNbackground, &bg,
                  XtNforeground, &fg,

=== modified file 'lwlib/xlwmenu.c'
--- a/lwlib/xlwmenu.c   2010-04-17 18:18:12 +0000
+++ b/lwlib/xlwmenu.c   2010-04-21 16:13:55 +0000
@@ -1304,10 +1304,10 @@
            XEvent* event,
            Boolean* continue_to_dispatch)
 {
+  XlwMenuWidget mw = (XlwMenuWidget) closure;
+  int i;
+
   *continue_to_dispatch = False;
-  XlwMenuWidget mw = (XlwMenuWidget) closure;
-  int i;
-
   for (i = 0; i < mw->menu.windows_length; ++i)
     if (mw->menu.windows [i].w == widget) break;
   if (i < mw->menu.windows_length && i < mw->menu.old_depth)

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2010-04-21 06:40:18 +0000
+++ b/src/ChangeLog     2010-04-21 16:13:55 +0000
@@ -1,3 +1,7 @@
+2010-04-21  Jan Djärv  <address@hidden>
+
+       * data.c (make_blv): Declarations before code (Bug#5993).
+
 2010-04-21  Glenn Morris  <address@hidden>
 
        * Makefile.in (DBUS_OBJ, GTK_OBJ, XMENU_OBJ, XOBJ):

=== modified file 'src/data.c'
--- a/src/data.c        2010-04-20 17:35:16 +0000
+++ b/src/data.c        2010-04-21 16:13:55 +0000
@@ -1558,10 +1558,14 @@
 {
   struct Lisp_Buffer_Local_Value *blv
     = xmalloc (sizeof (struct Lisp_Buffer_Local_Value));
-  Lisp_Object symbol; XSETSYMBOL (symbol, sym);
-  Lisp_Object tem = Fcons (symbol, (forwarded
-                                   ? do_symval_forwarding (valcontents.fwd)
-                                   : valcontents.value));
+  Lisp_Object symbol;
+  Lisp_Object tem;
+
+ XSETSYMBOL (symbol, sym);
+ tem = Fcons (symbol, (forwarded
+                       ? do_symval_forwarding (valcontents.fwd)
+                       : valcontents.value));
+
   /* Buffer_Local_Values cannot have as realval a buffer-local
      or keyboard-local forwarding.  */
   eassert (!(forwarded && BUFFER_OBJFWDP (valcontents.fwd)));