[Emacs-diffs] emacs-24 r117625: Fix bug #18839 with incorrect image size returned by posn-at-point.

[Eli Zaretskii]

------------------------------------------------------------
revno: 117625
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/18839
committer: Eli Zaretskii <address@hidden>
branch nick: emacs-24
timestamp: Sun 2014-10-26 17:42:08 +0200
message:
  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.
modified:
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/dispnew.c                  dispnew.c-20091113204419-o5vbwnq5f7feedwu-258

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2014-10-22 01:39:48 +0000
+++ b/src/ChangeLog     2014-10-26 15:42:08 +0000
@@ -1,3 +1,9 @@
+2014-10-26  Eli Zaretskii  <address@hidden>
+
+       * 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  <address@hidden>
 
        * xdisp.c (draw_glyphs): Set clipping to highlight boundaries.

=== modified file 'src/dispnew.c'
--- a/src/dispnew.c     2014-09-24 07:31:11 +0000
+++ b/src/dispnew.c     2014-10-26 15:42:08 +0000
@@ -5191,7 +5191,7 @@
      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))