[Emacs-diffs] Changes to emacs/lisp/subr.el

[John Paul Wallington]

Index: emacs/lisp/subr.el
diff -c emacs/lisp/subr.el:1.341 emacs/lisp/subr.el:1.342
*** emacs/lisp/subr.el:1.341    Thu Feb 20 15:07:41 2003
--- emacs/lisp/subr.el  Mon Mar 10 08:25:42 2003
***************
*** 655,662 ****
  as returned by the `event-start' and `event-end' functions.
  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)))
      (if (eq (if (consp (nth 1 position))
                (car (nth 1 position))
              (nth 1 position))
--- 655,665 ----
  as returned by the `event-start' and `event-end' functions.
  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)))
      (if (eq (if (consp (nth 1 position))
                (car (nth 1 position))
              (nth 1 position))
***************
*** 669,675 ****
          (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))))
          (cons x y))))))
  
  (defsubst posn-timestamp (position)
--- 672,678 ----
          (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))))
          (cons x y))))))
  
  (defsubst posn-timestamp (position)