From 11aad4e9f9f54ce8e9ecc66347e512b20a3cdf39 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Sun, 12 Dec 2010 22:45:57 +0200 Subject: subr.el (posn-col-row): Evaluate header-line-format in the context of the POSITION window's buffer. --- lisp/ChangeLog | 5 +++++ lisp/subr.el | 4 +++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 3191718bcf..bd5d557686 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2010-12-12 Eli Zaretskii + + * subr.el (posn-col-row): Evaluate header-line-format in the + context of the POSITION window's buffer. + 2010-12-11 Glenn Morris * subr.el (member-ignore-case, run-mode-hooks, insert-for-yank-1) diff --git a/lisp/subr.el b/lisp/subr.el index c0f65897f2..e4be7df50c 100644 --- 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. -- cgit v1.2.3