From: Eli Zaretskii <eliz@gnu.org>
Date: Sat, 13 Nov 2010 21:07:58 +0000 (+0200)
Subject: subr.el (posn-col-row): Pay attention to header line.  (Bug#7390)
X-Git-Tag: emacs-pretest-23.2.91~49^2~31
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=e68afd742f1d1a98f7d14219b3981ace2f91f39c;p=emacs.git

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

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 8be8e44d9a6..3e974e9b81f 100644
--- 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 41697faeaca..7449295421c 100644
--- 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.