# HG changeset patch
# User Stefan Monnier <monnier@iro.umontreal.ca>
# Date 1284734234 -7200
# Node ID 18b3ea98b1f4cfeadc5351e002d80ebda42559f2
# Parent  2103fda7335569c7354ee81edcb169800a1bcbd1
* src/frame.c (Ftool_bar_pixel_width): YAILOM (Yet another
int/Lisp_Object mixup).

diff -r 2103fda73355 -r 18b3ea98b1f4 src/ChangeLog
--- a/src/ChangeLog	Fri Sep 17 16:31:06 2010 +0200
+++ b/src/ChangeLog	Fri Sep 17 16:37:14 2010 +0200
@@ -1,3 +1,8 @@
+2010-09-17  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* frame.c (Ftool_bar_pixel_width): YAILOM (Yet another
+	int/Lisp_Object mixup).
+
 2010-09-17  Jan Djärv  <jan.h.d@swipnet.se>
 
 	* keyboard.c (parse_tool_bar_item): For QClabel, set TOOL_BAR_ITEM_LABEL
@@ -8,9 +13,10 @@
 	* frame.c (Ftool_bar_pixel_width): New function to expose tool
 	bar's pixel width to Lisp (Bug#7048).
 
- 2010-09-14  Juanma Barranquero  <lekktu@gmail.com>
-
- 	* cmds.c (syms_of_cmds) <post-self-insert-hook>: Fix typos in docstring.
+2010-09-14  Juanma Barranquero  <lekktu@gmail.com>
+
+	* cmds.c (syms_of_cmds) <post-self-insert-hook>: Fix typos in docstring.
+
 2010-09-17  Jan Djärv  <jan.h.d@swipnet.se>
 
 	* gtkutil.c (xg_pack_tool_bar): Call gtk_handle_box_set_handle_position
diff -r 2103fda73355 -r 18b3ea98b1f4 src/frame.c
--- a/src/frame.c	Fri Sep 17 16:31:06 2010 +0200
+++ b/src/frame.c	Fri Sep 17 16:37:14 2010 +0200
@@ -2669,7 +2669,7 @@
   if (FRAME_WINDOW_P (f))
     return make_number (FRAME_TOOLBAR_WIDTH (f));
 #endif
-  return 0;
+  return make_number (0);
 }
 
 DEFUN ("set-frame-height", Fset_frame_height, Sset_frame_height, 2, 3, 0,