Commit c632dfda authored by Jan Djärv's avatar Jan Djärv

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).
parent c5cbeb12
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
......
......@@ -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,
......
......@@ -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)
......
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):
......
......@@ -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)));
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment