From 4ddb20d610fe36cca1ca8d67dd2b1e2dc9b4d5a9 Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Fri, 17 Sep 2010 16:37:14 +0200 Subject: [PATCH] * src/frame.c (Ftool_bar_pixel_width): YAILOM (Yet another int/Lisp_Object mixup). --- src/ChangeLog | 10 ++++++++-- src/frame.c | 2 +- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index df7202fc243..2074205d38a 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2010-09-17 Stefan Monnier + + * frame.c (Ftool_bar_pixel_width): YAILOM (Yet another + int/Lisp_Object mixup). + 2010-09-17 Jan Djärv * 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 +2010-09-14 Juanma Barranquero + + * cmds.c (syms_of_cmds) : Fix typos in docstring. - * cmds.c (syms_of_cmds) : Fix typos in docstring. 2010-09-17 Jan Djärv * gtkutil.c (xg_pack_tool_bar): Call gtk_handle_box_set_handle_position diff --git a/src/frame.c b/src/frame.c index eb37d723991..04cc1ca07da 100644 --- a/src/frame.c +++ b/src/frame.c @@ -2669,7 +2669,7 @@ used. */) 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, -- 2.39.2