emacs-orgmode
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Minor patch


From: Stefan Monnier
Subject: Minor patch
Date: Wed, 13 Mar 2024 08:32:19 -0400
User-agent: Gnus/5.13 (Gnus v5.13)

The minor patch below clarifies what the computation is about and
removes the assumption that point-min == 1, while arguably
making the the code ever so slightly more efficient.


        Stefan
>From d386af0653ff75956cc20e0df8ddb5bfa86fec9d Mon Sep 17 00:00:00 2001
From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Wed, 13 Mar 2024 08:31:11 -0400
Subject: [PATCH] (org-src-font-lock-fontify-block): Clarify offset computation

* lisp/org-src.el (org-src-font-lock-fontify-block): Improve the translation
of local positions into org-buffer positions, and get rid of
assumption about the value of `point-min` while we're at it.
---
 lisp/org-src.el | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/lisp/org-src.el b/lisp/org-src.el
index de8d6ee42c..bec13427c2 100644
--- a/lisp/org-src.el
+++ b/lisp/org-src.el
@@ -681,7 +681,9 @@ as `org-src-fontify-natively' is non-nil."
            (unless (eq major-mode lang-mode) (funcall lang-mode))
             (setq native-tab-width tab-width)
             (font-lock-ensure)
-           (let ((pos (point-min)) next)
+           (let ((pos (point-min)) next
+                 ;; Difference between positions here and in org-buffer.
+                 (offset (- start (point-min))))
              (while (setq next (next-property-change pos))
                ;; Handle additional properties from font-lock, so as to
                ;; preserve, e.g., composition.
@@ -695,7 +697,7 @@ as `org-src-fontify-natively' is non-nil."
                     (when new-prop
                       (if (not (eq prop 'invisible))
                          (put-text-property
-                          (+ start (1- pos)) (1- (+ start next)) prop new-prop
+                          (+ offset pos) (+ offset next) prop new-prop
                           org-buffer)
                         ;; Special case.  `invisible' text property may
                         ;; clash with Org folding.  Do not assign
@@ -727,7 +729,7 @@ as `org-src-fontify-natively' is non-nil."
                             (when invisibility-spec
                               (add-to-invisibility-spec invisibility-spec))
                             (put-text-property
-                            (+ start (1- pos)) (1- (+ start next))
+                            (+ offset pos) (+ offset next)
                              'org-src-invisible new-prop
                             org-buffer)))))))
                (setq pos next)))
-- 
2.43.0


reply via email to

[Prev in Thread] Current Thread [Next in Thread]