Re: [PATCH] org-agenda: Use `window-max-chars-per-line' instead of `window-width'

[N. Jackson]

At 13:25 +0800 on Thursday 2022-04-21, Ihor Radchenko wrote:
>
> Attaching the patch.

Great. I tested the patch (with Org mode version 9.5.3) and that
fixes the problem for the block separator wrapping.

However, the problem with the tags wrapping in Agenda (instead of
being right aligned) remains.

Thank you and best regards,
N.


> From 5de3de87872ddae994f5b68eba74d915d5f73201 Mon Sep 17 00:00:00 2001
> Message-Id: 
> <5de3de87872ddae994f5b68eba74d915d5f73201.1650518543.git.yantar92@gmail.com>
> From: Ihor Radchenko <yantar92@gmail.com>
> Date: Thu, 21 Apr 2022 13:18:39 +0800
> Subject: [PATCH] org-agenda: Use `window-max-chars-per-line' instead of
>  `window-width'
>
> * lisp/org-agenda.el (org-agenda-prepare):
> (org-todo-list):
> (org-agenda-show-new-time): Calculate the maximum number of chars
> fitting into window via `window-max-chars-per-line' instead of
> `window-with'.  The latter can return larger number when fringes are
> disabled [1].
>
> [1] https://debbugs.gnu.org/cgi/bugreport.cgi?bug=19395
>
> Reported in https://orgmode.org/list/87czhdqi9p.fsf_-_@moondust.localdomain
> ---
>  lisp/org-agenda.el | 9 +++------
>  1 file changed, 3 insertions(+), 6 deletions(-)
>
> diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el
> index a09b53563..9ddee81ee 100644
> --- a/lisp/org-agenda.el
> +++ b/lisp/org-agenda.el
> @@ -3925,7 +3925,7 @@ (defun org-agenda-prepare (&optional name)
>             (insert "\n"
>                     (if (stringp org-agenda-block-separator)
>                         org-agenda-block-separator
> -                     (make-string (window-width) org-agenda-block-separator))
> +                     (make-string (window-max-chars-per-line) 
> org-agenda-block-separator))
>                     "\n"))
>           (narrow-to-region (point) (point-max)))
>       (setq org-done-keywords-for-agenda nil)
> @@ -4944,7 +4944,7 @@ (defun org-todo-list (&optional arg)
>           (let ((n 0))
>                (dolist (k kwds)
>                  (let ((s (format "(%d)%s" (cl-incf n) k)))
> -                  (when (> (+ (current-column) (string-width s) 1) 
> (window-width))
> +                  (when (> (+ (current-column) (string-width s) 1) 
> (window-max-chars-per-line))
>                      (insert "\n                     "))
>                    (insert " " s))))
>           (insert "\n"))
> @@ -10301,10 +10301,7 @@ (defun org-agenda-show-new-time (marker stamp 
> &optional prefix)
>                                 (line-end-position)
>                                 '(display nil))
>         (org-move-to-column
> -           (- (if (fboundp 'window-font-width)
> -                  (/ (window-width nil t) (window-font-width))
> -                ;; Fall back to pre-9.3.3 behavior on Emacs <25.
> -                (window-width))
> +           (- (window-max-chars-per-line)
>                (length stamp))
>             t)
>            (add-text-properties