[Emacs-diffs] /srv/bzr/emacs/trunk r101462: * src/frame.c (Ftool_bar_pixel_width): YAILOM (Yet another

[Stefan Monnier]

------------------------------------------------------------
revno: 101462
committer: Stefan Monnier <address@hidden>
branch nick: trunk
timestamp: Fri 2010-09-17 16:37:14 +0200
message:
  * src/frame.c (Ftool_bar_pixel_width): YAILOM (Yet another
  int/Lisp_Object mixup).
modified:
  src/ChangeLog
  src/frame.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2010-09-17 09:54:28 +0000
+++ b/src/ChangeLog     2010-09-17 14:37:14 +0000
@@ -1,3 +1,8 @@
+2010-09-17  Stefan Monnier  <address@hidden>
+
+       * frame.c (Ftool_bar_pixel_width): YAILOM (Yet another
+       int/Lisp_Object mixup).
+
 2010-09-17  Jan Djärv  <address@hidden>
 
        * 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  <address@hidden>
-
-       * cmds.c (syms_of_cmds) <post-self-insert-hook>: Fix typos in docstring.
+2010-09-14  Juanma Barranquero  <address@hidden>
+
+       * cmds.c (syms_of_cmds) <post-self-insert-hook>: Fix typos in docstring.
+
 2010-09-17  Jan Djärv  <address@hidden>
 
        * gtkutil.c (xg_pack_tool_bar): Call gtk_handle_box_set_handle_position

=== modified file 'src/frame.c'
--- a/src/frame.c       2010-09-17 09:04:35 +0000
+++ b/src/frame.c       2010-09-17 14:37:14 +0000
@@ -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,