mirror/org-mode
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs/org-mode.git synced 2024-11-23 07:18:53 +00:00
Code

org-colview: Fix ignoring org-agenda-columns-add-appointments-to-effort-sum

Browse Source 
* org-colview.el (org-columns--collect-values): Accept an additional
optional argument AGENDA-MARKER.
(org-agenda-columns): Pass the position of the current agenda line to
org-columns--collect-values through AGENDA-MARKER.  Use it to read the
'duration' property

Fixes the bug below.

Reported-by: Stanislav Vlasov
Link:
https://lists.gnu.org/archive/html/emacs-orgmode/2020-08/msg00090.html

also see the fix
Reported-by: Mamoru Miura
Link: https://lists.gnu.org/archive/html/emacs-orgmode/2022-07/msg00558.html

Previously, `org-agenda-columns' called `org-columns--collect-values' from
the buffer from which the agenda line originates. As a result,
`org-columns--collect-values' did not have access to the agenda line.
Mamoru Miura's solution recomputes the agenda-line.  My current patch
adds an optional argument to `org-columns--collect-values' which can be
used to pass the position of the agenda line.

TINYCHANGE
This commit is contained in:
Anand Deopurkar 2024-09-30 10:13:59 +10:00 committed by Ihor Radchenko
parent aead1f13ab
commit e2823be9da
No known key found for this signature in database
GPG Key ID: 6470762A7DA11D8B
1 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
lisp/org-colview.el
View File

@ -279,7 +279,7 @@ value for ITEM property."
(`(,_ ,_ ,_ ,_ ,printf) (format printf (string-to-number value)))
(_ (error "Invalid column specification format: %S" spec)))))
(defun org-columns--collect-values (&optional compiled-fmt)
(defun org-columns--collect-values (&optional compiled-fmt agenda-marker)
"Collect values for columns on the current line.
Return a list of triplets (SPEC VALUE DISPLAYED) suitable for
@ -287,7 +287,11 @@ Return a list of triplets (SPEC VALUE DISPLAYED) suitable for
This function assumes `org-columns-current-fmt-compiled' is
initialized is set in the current buffer. However, it is
possible to override it with optional argument COMPILED-FMT."
possible to override it with optional argument COMPILED-FMT.
The optional argument AGENDA-MARKER is used when called from the
agenda to pass a marker to the agenda line.
"
(let ((summaries (get-text-property (point) 'org-summaries)))
(mapcar
(lambda (spec)
@ -299,11 +303,19 @@ possible to override it with optional argument COMPILED-FMT."
;; Effort property is not defined. Try
;; to use appointment duration.
org-agenda-columns-add-appointments-to-effort-sum
agenda-marker
(string= p (upcase org-effort-property))
(get-text-property (point) 'duration)
(propertize (org-duration-from-minutes
(get-text-property (point) 'duration))
'face 'org-warning))
(get-text-property
(marker-position agenda-marker)
'duration
(marker-buffer agenda-marker))
(propertize
(org-duration-from-minutes
(get-text-property
(marker-position agenda-marker)
'duration
(marker-buffer agenda-marker)))
'face 'org-warning))
"")))
;; A non-nil COMPILED-FMT means we're calling from Org
;; Agenda mode, where we do not want leading stars for
@ -1758,8 +1770,9 @@ definition."
;; agenda buffer. Since current buffer is
;; changing, we need to force the original
;; compiled-fmt there.
(org-with-point-at m
(org-columns--collect-values compiled-fmt)))
(let ((agenda-marker (point-marker)))
(org-with-point-at m
(org-columns--collect-values compiled-fmt agenda-marker))))
cache)))
(forward-line))
(when cache