From ee24a85250b99a13292675ce030b5d88eb4a619b Mon Sep 17 00:00:00 2001 From: John Paul Wallington Date: Tue, 11 Mar 2003 12:49:20 +0000 Subject: [PATCH] (posn-col-row): Heed frame parameter `line-spacing' and `default-line-spacing', rather than buffer-local `line-spacing'. --- lisp/ChangeLog | 5 +++++ lisp/subr.el | 8 ++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 1eb657773cd..57f989ab7f7 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2003-03-11 John Paul Wallington + + * subr.el (posn-col-row): Heed frame parameter `line-spacing' and + `default-line-spacing', rather than buffer-local `line-spacing'. + 2003-03-10 Per Abrahamsen * cus-edit.el (customize-rogue): New command. diff --git a/lisp/subr.el b/lisp/subr.el index 29afbecb1e5..11e6869ffcd 100644 --- a/lisp/subr.el +++ b/lisp/subr.el @@ -657,9 +657,8 @@ For a scroll-bar event, the result column is 0, and the row corresponds to the vertical position of the click in the scroll bar." (let* ((pair (nth 2 position)) (window (posn-window position)) - (vspacing (or (buffer-local-value 'line-spacing - (window-buffer window)) - 0))) + (vspacing (or (frame-parameter (window-frame window) 'line-spacing) + default-line-spacing))) (if (eq (if (consp (nth 1 position)) (car (nth 1 position)) (nth 1 position)) @@ -672,7 +671,8 @@ corresponds to the vertical position of the click in the scroll bar." (cons (scroll-bar-scale pair (window-width window)) 0) (let* ((frame (if (framep window) window (window-frame window))) (x (/ (car pair) (frame-char-width frame))) - (y (/ (cdr pair) (+ (frame-char-height frame) vspacing)))) + (y (/ (cdr pair) (+ (frame-char-height frame) + (or vspacing 0))))) (cons x y)))))) (defsubst posn-timestamp (position) -- 2.39.2