[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals-release/org 1fe051fa19: fixup! org-string-width: Fix me
From: |
ELPA Syncer |
Subject: |
[elpa] externals-release/org 1fe051fa19: fixup! org-string-width: Fix measuring lines beyond window width |
Date: |
Tue, 5 Dec 2023 15:58:28 -0500 (EST) |
branch: externals-release/org
commit 1fe051fa19b7a1b1ab8fa0d14799e0e0156c3896
Author: Ihor Radchenko <yantar92@posteo.net>
Commit: Ihor Radchenko <yantar92@posteo.net>
fixup! org-string-width: Fix measuring lines beyond window width
---
lisp/org-macs.el | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
diff --git a/lisp/org-macs.el b/lisp/org-macs.el
index e138d5a17c..6ed901b739 100644
--- a/lisp/org-macs.el
+++ b/lisp/org-macs.el
@@ -1119,7 +1119,12 @@ Return width in pixels when PIXELS is non-nil."
(setq pixel-width
(if (get-buffer-window (current-buffer))
(car (window-text-pixel-size
- nil (line-beginning-position) (point-max) t))
+ ;; FIXME: 10000 because
+ ;; `most-positive-fixnum' ain't working
+ ;; (tests failing) and this call will be
+ ;; removed after we drop Emacs 28 support
+ ;; anyway.
+ nil (line-beginning-position) (point-max) 10000))
(let ((dedicatedp (window-dedicated-p))
(oldbuffer (window-buffer)))
(unwind-protect
@@ -1128,7 +1133,7 @@ Return width in pixels when PIXELS is non-nil."
(set-window-dedicated-p nil nil)
(set-window-buffer nil (current-buffer))
(car (window-text-pixel-size
- nil (line-beginning-position) (point-max)
t)))
+ nil (line-beginning-position) (point-max)
10000)))
(set-window-buffer nil oldbuffer)
(set-window-dedicated-p nil dedicatedp)))))
(unless pixels
@@ -1137,7 +1142,7 @@ Return width in pixels when PIXELS is non-nil."
(setq symbol-width
(if (get-buffer-window (current-buffer))
(car (window-text-pixel-size
- nil (line-beginning-position) (point-max) t))
+ nil (line-beginning-position) (point-max) 10000))
(let ((dedicatedp (window-dedicated-p))
(oldbuffer (window-buffer)))
(unwind-protect
@@ -1146,7 +1151,7 @@ Return width in pixels when PIXELS is non-nil."
(set-window-dedicated-p nil nil)
(set-window-buffer nil (current-buffer))
(car (window-text-pixel-size
- nil (line-beginning-position) (point-max)
t)))
+ nil (line-beginning-position) (point-max)
10000)))
(set-window-buffer nil oldbuffer)
(set-window-dedicated-p nil dedicatedp)))))))
(if pixels
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [elpa] externals-release/org 1fe051fa19: fixup! org-string-width: Fix measuring lines beyond window width,
ELPA Syncer <=