[Emacs-diffs] /srv/bzr/emacs/emacs-23 r100210: subr.el (posn-col-row): Pay attention to header line. (Bug#7390)

[Eli Zaretskii]

------------------------------------------------------------
revno: 100210
committer: Eli Zaretskii <address@hidden>
branch nick: emacs-23
timestamp: Sat 2010-11-13 23:07:58 +0200
message:
   subr.el (posn-col-row): Pay attention to header line.  (Bug#7390)
modified:
  lisp/ChangeLog
  lisp/subr.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2010-11-13 21:01:10 +0000
+++ b/lisp/ChangeLog    2010-11-13 21:07:58 +0000
@@ -1,3 +1,7 @@
+2010-11-13  Eli Zaretskii  <address@hidden>
+
+       * subr.el (posn-col-row): Pay attention to header line.  (Bug#7390)
+
 2010-11-13  Chong Yidong  <address@hidden>
 
        * textmodes/picture.el (picture-mouse-set-point): Don't use

=== modified file 'lisp/subr.el'
--- a/lisp/subr.el      2010-09-14 11:11:44 +0000
+++ b/lisp/subr.el      2010-11-13 21:07:58 +0000
@@ -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.