diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2010-11-17 22:54:14 -0500 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2010-11-17 22:54:14 -0500 |
| commit | 4a47c2757309e338321da1e7a2f6d399a306ce7d (patch) | |
| tree | de441bac2c90c3302459c5f0ffe9c53ec4b31c2f /lisp/subr.el | |
| parent | 8bbb7dd8a6d08540a81a7a2baa2274d8e6d65c92 (diff) | |
| parent | b916cbefa481920a49eac03c7025693f38afc882 (diff) | |
| download | emacs-4a47c2757309e338321da1e7a2f6d399a306ce7d.tar.gz | |
Merge from emacs-23
Diffstat (limited to 'lisp/subr.el')
| -rw-r--r-- | lisp/subr.el | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lisp/subr.el b/lisp/subr.el index c9300ad9711..70d8b76faa5 100644 --- a/lisp/subr.el +++ b/lisp/subr.el @@ -954,7 +954,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. |