# HG changeset patch
# User Jan D. <jan.h.d@swipnet.se>
# Date 1271866435 -7200
# Node ID 150fd3d78f5ab9e68f34a32a4086cfdbfef52de8
# Parent  2db141e518248ac74eeee28224d7b65542a66c67
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).

diff -r 2db141e51824 -r 150fd3d78f5a lwlib/ChangeLog
--- a/lwlib/ChangeLog	Wed Apr 21 07:00:58 2010 -0400
+++ b/lwlib/ChangeLog	Wed Apr 21 18:13:55 2010 +0200
@@ -1,3 +1,8 @@
+2010-04-21  Jan Djärv  <jan.h.d@swipnet.se>
+
+	* xlwmenu.c (expose_cb):
+	* lwlib-Xaw.c (fill_xft_data): Declarations before code.
+
 2010-04-17  Jan Djärv  <jan.h.d@swipnet.se>
 
 	* xlwmenu.c: Include Shell.h, remove duplicate declaration of
diff -r 2db141e51824 -r 150fd3d78f5a lwlib/lwlib-Xaw.c
--- a/lwlib/lwlib-Xaw.c	Wed Apr 21 07:00:58 2010 -0400
+++ b/lwlib/lwlib-Xaw.c	Wed Apr 21 18:13:55 2010 +0200
@@ -150,12 +150,12 @@
 static void
 fill_xft_data (struct widget_xft_data *data, Widget widget, XftFont *font)
 {
-  data->widget = widget;
-  data->xft_font = font;
   Pixel bg, fg;
   XColor colors[2];
   int screen = XScreenNumberOfScreen (XtScreen (widget));
 
+  data->widget = widget;
+  data->xft_font = font;
   XtVaGetValues (widget,
                  XtNbackground, &bg,
                  XtNforeground, &fg,
diff -r 2db141e51824 -r 150fd3d78f5a lwlib/xlwmenu.c
--- a/lwlib/xlwmenu.c	Wed Apr 21 07:00:58 2010 -0400
+++ b/lwlib/xlwmenu.c	Wed Apr 21 18:13:55 2010 +0200
@@ -1304,10 +1304,10 @@
            XEvent* event,
            Boolean* continue_to_dispatch)
 {
-  *continue_to_dispatch = False;
   XlwMenuWidget mw = (XlwMenuWidget) closure;
   int i;
 
+  *continue_to_dispatch = False;
   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)
diff -r 2db141e51824 -r 150fd3d78f5a src/ChangeLog
--- a/src/ChangeLog	Wed Apr 21 07:00:58 2010 -0400
+++ b/src/ChangeLog	Wed Apr 21 18:13:55 2010 +0200
@@ -1,3 +1,7 @@
+2010-04-21  Jan Djärv  <jan.h.d@swipnet.se>
+
+	* data.c (make_blv): Declarations before code (Bug#5993).
+
 2010-04-21  Glenn Morris  <rgm@gnu.org>
 
 	* Makefile.in (DBUS_OBJ, GTK_OBJ, XMENU_OBJ, XOBJ):
diff -r 2db141e51824 -r 150fd3d78f5a src/data.c
--- a/src/data.c	Wed Apr 21 07:00:58 2010 -0400
+++ b/src/data.c	Wed Apr 21 18:13:55 2010 +0200
@@ -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)));