upstream

4 files changed, 29 insertions, 11 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 67f8507a26b..ccfcb48daf0 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,7 +1,15 @@
+2011-11-04  Eli Zaretskii  <eliz@gnu.org>
+
+        * window.c (Fwindow_body_size): Mention in the doc string that the
+        return value is in frame's canonical units.  (Bug#9949)
+
 2011-11-03  Eli Zaretskii  <eliz@gnu.org>
 
+        * xdisp.c (note_mouse_highlight): Initialize `area'.  (Bug#9947)
+
         * w32fns.c (unwind_create_frame): If needed, free the glyph
         matrices of the partially constructed frame.  (Bug#9943)
+        * xfns.c (unwind_create_frame): Likewise.
 
 2011-11-01  Eli Zaretskii  <eliz@gnu.org>
 
diff --git a/src/window.c b/src/window.c
index 056da1512da..496a4e6c6ea 100644
--- a/src/window.c
+++ b/src/window.c
@@ -655,16 +655,25 @@ window_body_cols (struct window *w)
 }
 
 DEFUN ("window-body-size", Fwindow_body_size, Swindow_body_size, 0, 2, 0,
-       doc: /* Return the number of lines of WINDOW's body.
-WINDOW must be a live window and defaults to the selected one.  The
-return value does not include WINDOW's mode line and header line, if
-any.
-
-Optional argument HORIZONTAL non-nil means return the number of columns
-of WINDOW's body.  In this case, the return value does not include any
-vertical dividers or scroll bars owned by WINDOW.  On a window-system
-the return value does not include the number of columns used for
-WINDOW's fringes or display margins either.  */)
+       doc: /* Return the number of lines or columns of WINDOW's body.
+WINDOW must be a live window and defaults to the selected one.
+
+If the optional argument HORIZONTAL is omitted or nil, the function
+returns the number of WINDOW's lines, excluding the mode line and
+header line, if any.
+
+If HORIZONTAL is non-nil, the function returns the number of columns
+excluding any vertical dividers or scroll bars owned by WINDOW.  On a
+window-system the return value also excludes the number of columns
+used for WINDOW's fringes or display margins.
+
+Note that the return value is measured in canonical units, i.e. for
+the default frame's face.  If the window shows some characters with
+non-default face, e.g., if the font of some characters is larger or
+smaller than the default font, the value returned by this function
+will not match the actual number of lines or characters per line
+shown in the window.  To get the actual number of columns and lines,
+use `posn-at-point'.  */)
   (Lisp_Object window, Lisp_Object horizontal)
 {
   struct window *w = decode_any_window (window);
diff --git a/src/xdisp.c b/src/xdisp.c
index b7fc1141e28..6414ab00fd8 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -27130,7 +27130,7 @@ note_mouse_highlight (struct frame *f, int x, int y)
       && XFASTINT (w->last_modified) == BUF_MODIFF (b)
       && XFASTINT (w->last_overlay_modified) == BUF_OVERLAY_MODIFF (b))
     {
-      int hpos, vpos, dx, dy, area;
+      int hpos, vpos, dx, dy, area = LAST_AREA;
       EMACS_INT pos;
       struct glyph *glyph;
       Lisp_Object object;
diff --git a/src/xfns.c b/src/xfns.c
index 913cde75d91..ac030582ffe 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -2936,6 +2936,7 @@ unwind_create_frame (Lisp_Object frame)
 #endif
 
       x_free_frame_resources (f);
+      free_glyphs (f);
 
 #if GLYPH_DEBUG
       /* Check that reference counts are indeed correct.  */