diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2010-11-13 23:07:58 +0200 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2010-11-13 23:07:58 +0200 |
| commit | e68afd742f1d1a98f7d14219b3981ace2f91f39c (patch) | |
| tree | 9d484255dae9ab0e3739cda6fe78d2411e13eb2a /lisp | |
| parent | de02effd8d2c2f8ada0eb8bda143b38e7506e2ae (diff) | |
| download | emacs-e68afd742f1d1a98f7d14219b3981ace2f91f39c.tar.gz | |
subr.el (posn-col-row): Pay attention to header line. (Bug#7390)
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/subr.el | 3 |
2 files changed, 6 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 8be8e44d9a6..3e974e9b81f 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2010-11-13 Eli Zaretskii <eliz@gnu.org> + + * subr.el (posn-col-row): Pay attention to header line. (Bug#7390) + 2010-11-13 Chong Yidong <cyd@stupidchicken.com> * textmodes/picture.el (picture-mouse-set-point): Don't use diff --git a/lisp/subr.el b/lisp/subr.el index 41697faeaca..7449295421c 100644 --- a/lisp/subr.el +++ b/lisp/subr.el @@ -955,7 +955,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. |