aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJan Djärv2010-04-21 18:13:55 +0200
committerJan Djärv2010-04-21 18:13:55 +0200
commitc632dfda11b0ad6a144704dc473e4ff6bbac0990 (patch)
tree6065155419ae993b72a32027a0ef3d15fc376270 /src
parentc5cbeb128e3d3fc20d6e481308f154526c96e6cf (diff)
downloademacs-c632dfda11b0ad6a144704dc473e4ff6bbac0990.tar.gz
emacs-c632dfda11b0ad6a144704dc473e4ff6bbac0990.zip
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).
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog4
-rw-r--r--src/data.c12
2 files changed, 12 insertions, 4 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 05d1f550a55..14790309a11 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
12010-04-21 Jan Djärv <jan.h.d@swipnet.se>
2
3 * data.c (make_blv): Declarations before code (Bug#5993).
4
12010-04-21 Glenn Morris <rgm@gnu.org> 52010-04-21 Glenn Morris <rgm@gnu.org>
2 6
3 * Makefile.in (DBUS_OBJ, GTK_OBJ, XMENU_OBJ, XOBJ): 7 * 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
1558{ 1558{
1559 struct Lisp_Buffer_Local_Value *blv 1559 struct Lisp_Buffer_Local_Value *blv
1560 = xmalloc (sizeof (struct Lisp_Buffer_Local_Value)); 1560 = xmalloc (sizeof (struct Lisp_Buffer_Local_Value));
1561 Lisp_Object symbol; XSETSYMBOL (symbol, sym); 1561 Lisp_Object symbol;
1562 Lisp_Object tem = Fcons (symbol, (forwarded 1562 Lisp_Object tem;
1563 ? do_symval_forwarding (valcontents.fwd) 1563
1564 : valcontents.value)); 1564 XSETSYMBOL (symbol, sym);
1565 tem = Fcons (symbol, (forwarded
1566 ? do_symval_forwarding (valcontents.fwd)
1567 : valcontents.value));
1568
1565 /* Buffer_Local_Values cannot have as realval a buffer-local 1569 /* Buffer_Local_Values cannot have as realval a buffer-local
1566 or keyboard-local forwarding. */ 1570 or keyboard-local forwarding. */
1567 eassert (!(forwarded && BUFFER_OBJFWDP (valcontents.fwd))); 1571 eassert (!(forwarded && BUFFER_OBJFWDP (valcontents.fwd)));