subr.el (posn-col-row): Evaluate header-line-format in the context of

 the POSITION window's buffer.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 3191718bcfc71d829f184277a440ed25fce59e7e..bd5d55768671f99f2ef754dc132fff8a575e784b 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2010-12-12  Eli Zaretskii  <eliz@gnu.org>
+
+       * subr.el (posn-col-row): Evaluate header-line-format in the
+       context of the POSITION window's buffer.
+
 2010-12-11  Glenn Morris  <rgm@gnu.org>
 
        * subr.el (member-ignore-case, run-mode-hooks, insert-for-yank-1)

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