diff options
| author | Stefan Monnier <[email protected]> | 2010-09-17 16:37:14 +0200 |
|---|---|---|
| committer | Stefan Monnier <[email protected]> | 2010-09-17 16:37:14 +0200 |
| commit | 4ddb20d610fe36cca1ca8d67dd2b1e2dc9b4d5a9 (patch) | |
| tree | 259c871a18d762917bd05ebc72b8e7433fe89466 | |
| parent | 3fe6ef4e36bf853b4b99c2520c9bf066023329e0 (diff) | |
* src/frame.c (Ftool_bar_pixel_width): YAILOM (Yet another
int/Lisp_Object mixup).
| -rw-r--r-- | src/ChangeLog | 10 | ||||
| -rw-r--r-- | src/frame.c | 2 |
2 files changed, 9 insertions, 3 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index df7202fc24..2074205d38 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2010-09-17 Stefan Monnier <[email protected]> + + * frame.c (Ftool_bar_pixel_width): YAILOM (Yet another + int/Lisp_Object mixup). + 2010-09-17 Jan Djärv <[email protected]> * 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 <[email protected]> +2010-09-14 Juanma Barranquero <[email protected]> + + * cmds.c (syms_of_cmds) <post-self-insert-hook>: Fix typos in docstring. - * cmds.c (syms_of_cmds) <post-self-insert-hook>: Fix typos in docstring. 2010-09-17 Jan Djärv <[email protected]> * gtkutil.c (xg_pack_tool_bar): Call gtk_handle_box_set_handle_position diff --git a/src/frame.c b/src/frame.c index eb37d72399..04cc1ca07d 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, |