Fix bug #18839 with incorrect image size returned by posn-at-point.

 src/dispnew.c (buffer_posn_from_coords): Use
 WINDOW_WANTS_HEADER_LINE_P, not WINDOW_WANTS_MODELINE_P, to
 account for the header-line height.

diff --git a/src/ChangeLog b/src/ChangeLog
index 28af50269286cb85592190a866a7cede74119db2..da3e4d682d557318a1fdf8c2983dd1931e4e4296 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2014-10-26  Eli Zaretskii  <eliz@gnu.org>
+
+       * dispnew.c (buffer_posn_from_coords): Use
+       WINDOW_WANTS_HEADER_LINE_P, not WINDOW_WANTS_MODELINE_P, to
+       account for the header-line height.  (Bug#18839)
+
 2014-10-22  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
 
        * xdisp.c (draw_glyphs): Set clipping to highlight boundaries.

diff --git a/src/dispnew.c b/src/dispnew.c
index 713457750453af06b638cc74be5dd4a049c76071..ffd51e08e98dc11b0c04eaf26364d6bffa4ebc5f 100644 (file)
--- a/src/dispnew.c
+++ b/src/dispnew.c
@@ -5191,7 +5191,7 @@ buffer_posn_from_coords (struct window *w, int *x, int *y, struct display_pos *p
      start position, i.e. it excludes the header-line row, but
      MATRIX_ROW includes the header-line row.  Adjust for a possible
      header-line row.  */
-  it_vpos = it.vpos + WINDOW_WANTS_MODELINE_P (w);
+  it_vpos = it.vpos + WINDOW_WANTS_HEADER_LINE_P (w);
   if (it_vpos < w->current_matrix->nrows
       && (row = MATRIX_ROW (w->current_matrix, it_vpos),
          row->enabled_p))