[Emacs-diffs] /srv/bzr/emacs/emacs-23 r100307: subr.el (posn-col-row): Evaluate header-line-format in the context of

[Eli Zaretskii]

------------------------------------------------------------
revno: 100307
committer: Eli Zaretskii <address@hidden>
branch nick: emacs-23
timestamp: Sun 2010-12-12 22:45:57 +0200
message:
   subr.el (posn-col-row): Evaluate header-line-format in the context of
   the POSITION window's buffer.
modified:
  lisp/ChangeLog
  lisp/subr.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2010-12-11 02:34:55 +0000
+++ b/lisp/ChangeLog    2010-12-12 20:45:57 +0000
@@ -1,3 +1,8 @@
+2010-12-12  Eli Zaretskii  <address@hidden>
+
+       * subr.el (posn-col-row): Evaluate header-line-format in the
+       context of the POSITION window's buffer.
+
 2010-12-11  Glenn Morris  <address@hidden>
 
        * subr.el (member-ignore-case, run-mode-hooks, insert-for-yank-1)

=== modified file 'lisp/subr.el'
--- a/lisp/subr.el      2010-12-11 02:34:55 +0000
+++ b/lisp/subr.el      2010-12-12 20:45:57 +0000
@@ -958,7 +958,9 @@
               (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.