Merge from emacs-23

[gnu-emacs] / lisp / subr.el

diff --git a/lisp/subr.el b/lisp/subr.el
index c9300ad9711b3776f071fc78e8a907d1e7ea49f5..70d8b76faa510b9f56768a297afdacb3e30e5457 100644 (file)
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -954,7 +954,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.