# HG changeset patch
# User Eli Zaretskii <eliz@gnu.org>
# Date 1289682478 -7200
# Node ID ab9aebf1b099a392b54086b4754bc98a6c6718f3
# Parent  31f67bce56451acc020a4730b33ce3fb20b624ee
 subr.el (posn-col-row): Pay attention to header line.  (Bug#7390)

diff -r 31f67bce5645 -r ab9aebf1b099 lisp/ChangeLog
--- a/lisp/ChangeLog	Sat Nov 13 16:01:10 2010 -0500
+++ b/lisp/ChangeLog	Sat Nov 13 23:07:58 2010 +0200
@@ -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 -r 31f67bce5645 -r ab9aebf1b099 lisp/subr.el
--- a/lisp/subr.el	Sat Nov 13 16:01:10 2010 -0500
+++ b/lisp/subr.el	Sat Nov 13 23:07:58 2010 +0200
@@ -955,7 +955,8 @@
 	      ((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.