From: Po Lu <luangruo@yahoo.com>
Date: Mon, 13 Dec 2021 01:59:39 +0000 (+0800)
Subject: Work around pixel scrolling issues when org-indent-mode is on
X-Git-Tag: emacs-29.0.90~3595^2~2
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=2f6601054940e698184f4c9c60a47c16e5baa880;p=emacs.git

Work around pixel scrolling issues when org-indent-mode is on

* lisp/pixel-scroll.el (pixel-point-and-height-at-unseen-line):
Subtract line height of window start when it doesn't appear
at the 0th pixel of the line.
---

diff --git a/lisp/pixel-scroll.el b/lisp/pixel-scroll.el
index 0e22ef2a6a7..142ebf9c65a 100644
--- a/lisp/pixel-scroll.el
+++ b/lisp/pixel-scroll.el
@@ -416,6 +416,12 @@ window, and the pixel height of that line."
     ;; restore initial position
     (set-window-start nil pos0 t)
     (set-window-vscroll nil vscroll0 t)
+    (when (and line-height
+               (> (car (posn-x-y (posn-at-point pos0))) 0))
+      (setq line-height (- line-height
+                           (save-excursion
+                             (goto-char pos0)
+                             (line-pixel-height)))))
     (cons pos line-height)))
 
 (defun pixel-point-at-unseen-line ()