aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEli Zaretskii <[email protected]>2010-12-12 22:45:57 +0200
committerEli Zaretskii <[email protected]>2010-12-12 22:45:57 +0200
commit11aad4e9f9f54ce8e9ecc66347e512b20a3cdf39 (patch)
tree09beb0200c6b9515d9bf45223050202425c998f6
parent15579471891efd210b5d9edd29c1374cba98f648 (diff)
subr.el (posn-col-row): Evaluate header-line-format in the context of
the POSITION window's buffer.
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/subr.el4
2 files changed, 8 insertions, 1 deletions
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 <[email protected]>
+
+ * subr.el (posn-col-row): Evaluate header-line-format in the
+ context of the POSITION window's buffer.
+
2010-12-11 Glenn Morris <[email protected]>
* 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.