summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIhor Radchenko <yantar92@posteo.net>2023-12-05 16:38:42 +0100
committerIhor Radchenko <yantar92@posteo.net>2023-12-05 16:40:37 +0100
commit4a7a1f2fe7fc6332f011dc281fdcf35f54e6dd68 (patch)
tree929f1c7980457b857a5fb0cf105bd8dd43ad2055
parent3cdb637fcffc36bad336aed0f2b346443872d03a (diff)
downloadorg-mode-4a7a1f2fe.tar.gz
org-string-width: Fix measuring lines beyond window width
* lisp/org-macs.el (org-string-width): Pass non-nil X-LIMIT argument to `window-text-pixel-size' to not limit the maximum width to window pixel width. Reported-by: Raffael Stocker <r.stocker@mnet-mail.de> Link: https://orgmode.org/list/yplmr0k4bv9d.fsf@mnet-mail.de
-rw-r--r--lisp/org-macs.el8
1 files changed, 4 insertions, 4 deletions
diff --git a/lisp/org-macs.el b/lisp/org-macs.el
index 4efa8ba..e138d5a 100644
--- a/lisp/org-macs.el
+++ b/lisp/org-macs.el
@@ -1119,7 +1119,7 @@ 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)))
+ nil (line-beginning-position) (point-max) t))
(let ((dedicatedp (window-dedicated-p))
(oldbuffer (window-buffer)))
(unwind-protect
@@ -1128,7 +1128,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))))
+ nil (line-beginning-position) (point-max) t)))
(set-window-buffer nil oldbuffer)
(set-window-dedicated-p nil dedicatedp)))))
(unless pixels
@@ -1137,7 +1137,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)))
+ nil (line-beginning-position) (point-max) t))
(let ((dedicatedp (window-dedicated-p))
(oldbuffer (window-buffer)))
(unwind-protect
@@ -1146,7 +1146,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))))
+ nil (line-beginning-position) (point-max) t)))
(set-window-buffer nil oldbuffer)
(set-window-dedicated-p nil dedicatedp)))))))
(if pixels