subr.el (posn-col-row): Pay attention to header line. (Bug#7390)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 8be8e44d9a62396fcf1f0a9937c380077346fb92..3e974e9b81f3f024dc0c6d38a601d9e7f936862b 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2010-11-13  Eli Zaretskii  <eliz@gnu.org>
+
+       * subr.el (posn-col-row): Pay attention to header line.  (Bug#7390)
+
 2010-11-13  Chong Yidong  <cyd@stupidchicken.com>
 
        * textmodes/picture.el (picture-mouse-set-point): Don't use

diff --git a/lisp/subr.el b/lisp/subr.el
index 41697faeacaaec2e4ce508d050bf6a454677b772..7449295421c36e3ddb85f1da3b1a3964fb7a0b76 100644 (file)
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -955,7 +955,8 @@ and `event-end' functions."
              ((null spacing)
               (setq spacing 0)))
        (cons (/ (car pair) (frame-char-width frame))
-             (/ (cdr pair) (+ (frame-char-height frame) spacing))))))))
+             (- (/ (cdr pair) (+ (frame-char-height frame) spacing))
+                (if (null header-line-format) 0 1))))))))
 
 (defun posn-actual-col-row (position)
   "Return the actual column and row in POSITION, measured in characters.