diff options
| -rw-r--r-- | lwlib/ChangeLog | 5 | ||||
| -rw-r--r-- | lwlib/lwlib-Xaw.c | 4 | ||||
| -rw-r--r-- | lwlib/xlwmenu.c | 2 | ||||
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/data.c | 12 |
5 files changed, 20 insertions, 7 deletions
diff --git a/lwlib/ChangeLog b/lwlib/ChangeLog index 35cb646fbcb..52728552eac 100644 --- a/lwlib/ChangeLog +++ b/lwlib/ChangeLog @@ -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 --git a/lwlib/lwlib-Xaw.c b/lwlib/lwlib-Xaw.c index c6bbae7e3c9..d31b4602147 100644 --- a/lwlib/lwlib-Xaw.c +++ b/lwlib/lwlib-Xaw.c @@ -150,12 +150,12 @@ xaw_update_scrollbar (instance, widget, val) 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 --git a/lwlib/xlwmenu.c b/lwlib/xlwmenu.c index d396aa651e9..52a89de2204 100644 --- a/lwlib/xlwmenu.c +++ b/lwlib/xlwmenu.c @@ -1304,10 +1304,10 @@ expose_cb (Widget widget, 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 --git a/src/ChangeLog b/src/ChangeLog index 05d1f550a55..14790309a11 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -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 --git a/src/data.c b/src/data.c index 43d168cc63d..e9f2dea522b 100644 --- a/src/data.c +++ b/src/data.c @@ -1558,10 +1558,14 @@ make_blv (struct Lisp_Symbol *sym, int forwarded, union Lisp_Val_Fwd valcontents { 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))); |