* [PATCH] org-archive.el: Fix org-add-archive-files to correctly de-duplicate
@ 2024-03-02 10:46 14% Anand Deopurkar
2024-03-02 12:28 8% ` Ihor Radchenko
0 siblings, 1 reply; 11+ results
From: Anand Deopurkar @ 2024-03-02 10:46 UTC (permalink / raw)
To: emacs-orgmode
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: 0001-org-archive.el-Fix-org-add-archive-files-to-correctl.patch --]
[-- Type: text/x-patch, Size: 1449 bytes --]
From 44b681b82a23f0a475e706d4fab2a46d6aedeea5 Mon Sep 17 00:00:00 2001
From: Anand Deopurkar <anandrdeopurkar@gmail.com>
Date: Sat, 2 Mar 2024 21:24:19 +1100
Subject: [PATCH] org-archive.el: Fix org-add-archive-files to correctly
de-duplicate
* org-archive.el (org-add-archive-files): Use `seq-uniq' with TESTFN
`\#\'file-equal-p' to de-duplicate the list of gathered files.
Previously, `org-uniquify' was used. This de-duplicates the
file-names, but not necessarily the files. The problem occurs if the
list of file-names includes distinct file-names that reference the
same file (symbolic links, for example).
TINYCHANGE
---
lisp/org-archive.el | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/lisp/org-archive.el b/lisp/org-archive.el
index 20b962057..e46649fd3 100644
--- a/lisp/org-archive.el
+++ b/lisp/org-archive.el
@@ -157,7 +157,7 @@ archive location, but not yet deleted from the original file.")
"Splice the archive FILES into the list of files.
This implies visiting all these files and finding out what the
archive file is."
- (org-uniquify
+ (seq-uniq
(apply
'append
(mapcar
@@ -166,7 +166,9 @@ archive file is."
nil
(with-current-buffer (org-get-agenda-file-buffer f)
(cons f (org-all-archive-files)))))
- files))))
+ files))
+ #'file-equal-p
+ ))
(defun org-all-archive-files ()
"List of all archive files used in the current buffer."
--
2.43.0
^ permalink raw reply related [relevance 14%]
* Re: [PATCH] org-archive.el: Fix org-add-archive-files to correctly de-duplicate
2024-03-02 10:46 14% [PATCH] org-archive.el: Fix org-add-archive-files to correctly de-duplicate Anand Deopurkar
@ 2024-03-02 12:28 8% ` Ihor Radchenko
0 siblings, 0 replies; 11+ results
From: Ihor Radchenko @ 2024-03-02 12:28 UTC (permalink / raw)
To: Anand Deopurkar; +Cc: emacs-orgmode
Anand Deopurkar <anandrdeopurkar@gmail.com> writes:
> Subject: [PATCH] org-archive.el: Fix org-add-archive-files to correctly
> de-duplicate
>
> * org-archive.el (org-add-archive-files): Use `seq-uniq' with TESTFN
> `\#\'file-equal-p' to de-duplicate the list of gathered files.
>
> Previously, `org-uniquify' was used. This de-duplicates the
> file-names, but not necessarily the files. The problem occurs if the
> list of file-names includes distinct file-names that reference the
> same file (symbolic links, for example).
Thanks for the patch!
Applied, onto main.
https://git.savannah.gnu.org/cgit/emacs/org-mode.git/commit/?id=902dacb9c
I also added you to the contributor list.
https://git.sr.ht/~bzg/worg/commit/58d6aca1
--
Ihor Radchenko // yantar92,
Org mode contributor,
Learn more about Org mode at <https://orgmode.org/>.
Support Org development at <https://liberapay.com/org-mode>,
or support my work at <https://liberapay.com/yantar92>
^ permalink raw reply [relevance 8%]
* [PATCH] org-agenda.el: Fix org-agenda-write to avoid duplicates
@ 2024-03-03 9:12 14% Anand Deopurkar
2024-03-03 13:47 8% ` Ihor Radchenko
0 siblings, 1 reply; 11+ results
From: Anand Deopurkar @ 2024-03-03 9:12 UTC (permalink / raw)
To: Org Mode List
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: 0001-org-agenda.el-Fix-org-agenda-write-to-avoid-duplicat.patch --]
[-- Type: text/x-patch, Size: 1439 bytes --]
From a269ee1d657ea11f998d294169cd9a88618409fb Mon Sep 17 00:00:00 2001
From: Anand Deopurkar <anandrdeopurkar@gmail.com>
Date: Sun, 3 Mar 2024 16:38:43 +1100
Subject: [PATCH] org-agenda.el: Fix org-agenda-write to avoid duplicates
* lisp/org-agenda.el (org-agenda-write): Make sure headlines are not
duplicated when writing to an `org' file, even if they are repeated in
the agenda view.
For example, a headline may appear multiple times in the agenda
view (for example, if it has multiple time stamps). But
org-agenda-write should write it only once to the output `org' file.
TINYCHANGE
---
lisp/org-agenda.el | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el
index 8cb3496ca..798ef1a10 100644
--- a/lisp/org-agenda.el
+++ b/lisp/org-agenda.el
@@ -3641,11 +3641,12 @@ the agenda to write."
(goto-char p)
(setq m (get-text-property (point) 'org-hd-marker))
(when m
- (push (with-current-buffer (marker-buffer m)
- (goto-char m)
- (org-copy-subtree 1 nil t t)
- org-subtree-clip)
- content)))
+ (cl-pushnew (with-current-buffer (marker-buffer m)
+ (goto-char m)
+ (org-copy-subtree 1 nil t t)
+ org-subtree-clip)
+ content
+ :test #'equal)))
(find-file file)
(erase-buffer)
(dolist (s content) (org-paste-subtree 1 s))
--
2.43.0
^ permalink raw reply related [relevance 14%]
* Re: [PATCH] org-agenda.el: Fix org-agenda-write to avoid duplicates
2024-03-03 9:12 14% [PATCH] org-agenda.el: Fix org-agenda-write to avoid duplicates Anand Deopurkar
@ 2024-03-03 13:47 8% ` Ihor Radchenko
0 siblings, 0 replies; 11+ results
From: Ihor Radchenko @ 2024-03-03 13:47 UTC (permalink / raw)
To: Anand Deopurkar; +Cc: Org Mode List
Anand Deopurkar <anandrdeopurkar@gmail.com> writes:
> Subject: [PATCH] org-agenda.el: Fix org-agenda-write to avoid duplicates
>
> * lisp/org-agenda.el (org-agenda-write): Make sure headlines are not
> duplicated when writing to an `org' file, even if they are repeated in
> the agenda view.
>
> For example, a headline may appear multiple times in the agenda
> view (for example, if it has multiple time stamps). But
> org-agenda-write should write it only once to the output `org' file.
Thanks for the patch!
Applied, onto main.
https://git.savannah.gnu.org/cgit/emacs/org-mode.git/commit/?id=8ac99c33f
--
Ihor Radchenko // yantar92,
Org mode contributor,
Learn more about Org mode at <https://orgmode.org/>.
Support Org development at <https://liberapay.com/org-mode>,
or support my work at <https://liberapay.com/yantar92>
^ permalink raw reply [relevance 8%]
* [PATCH] lisp/org-capture.el: Restore org-store-link-plist
@ 2024-05-17 11:38 13% Anand Deopurkar
2024-05-18 10:56 8% ` Ihor Radchenko
0 siblings, 1 reply; 11+ results
From: Anand Deopurkar @ 2024-05-17 11:38 UTC (permalink / raw)
To: emacs-orgmode
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: 0001-lisp-org-capture.el-Restore-org-store-link-plist.patch --]
[-- Type: text/x-patch, Size: 2048 bytes --]
From 8f603b721ddd7edf1e622a39dc80f4b74a5b5198 Mon Sep 17 00:00:00 2001
From: Anand Deopurkar <anandrdeopurkar@gmail.com>
Date: Fri, 17 May 2024 20:39:51 +1000
Subject: [PATCH] lisp/org-capture.el: Restore org-store-link-plist
* org-capture.el (org-capture-fill-template): Restore original
`org-store-link-plist' after calling `org-store-link'.
To replace a %K escape (link to currently clocked task),
`org-capture-fill-template' calls `org-store-link'. This call has the
side-effect of replacing the contents of `org-store-link-plist'. As a
result, expected template expansions using the original
`org-store-link-plist' do not happen.
For example, suppose `org-capture' is called from a message buffer with the
template "%:subject %:from" while the clock is running. Then
%:subject and %:from are not substituted because of the behaviour
above. If the clock is not running, there is no problem.
Current fix restores `org-store-link-plist' to its original value
after `org-capture-fill-template' calls `org-store-link'.
TINYCHANGE
---
lisp/org-capture.el | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/lisp/org-capture.el b/lisp/org-capture.el
index da14f45c0..9d8f855ef 100644
--- a/lisp/org-capture.el
+++ b/lisp/org-capture.el
@@ -1675,9 +1675,12 @@ Expansion occurs in a temporary Org mode buffer."
(org-no-properties org-clock-heading)
""))
(v-K (if (marker-buffer org-clock-marker)
- (org-with-point-at org-clock-marker
- (org-store-link nil nil))
- ""))
+ (let ((original-link-plist org-store-link-plist)
+ (clocked-task-link (org-with-point-at org-clock-marker
+ (org-store-link nil nil))))
+ (setq org-store-link-plist original-link-plist)
+ clocked-task-link)
+ ""))
(v-f (or (org-capture-get :original-file-nondirectory) ""))
(v-F (or (org-capture-get :original-file) ""))
(org-capture--clipboards
--
2.44.0
^ permalink raw reply related [relevance 13%]
* Re: [PATCH] lisp/org-capture.el: Restore org-store-link-plist
2024-05-17 11:38 13% [PATCH] lisp/org-capture.el: Restore org-store-link-plist Anand Deopurkar
@ 2024-05-18 10:56 8% ` Ihor Radchenko
0 siblings, 0 replies; 11+ results
From: Ihor Radchenko @ 2024-05-18 10:56 UTC (permalink / raw)
To: Anand Deopurkar; +Cc: emacs-orgmode
Anand Deopurkar <anandrdeopurkar@gmail.com> writes:
> From 8f603b721ddd7edf1e622a39dc80f4b74a5b5198 Mon Sep 17 00:00:00 2001
> From: Anand Deopurkar <anandrdeopurkar@gmail.com>
> Date: Fri, 17 May 2024 20:39:51 +1000
> Subject: [PATCH] lisp/org-capture.el: Restore org-store-link-plist
Applied, onto main.
https://git.savannah.gnu.org/cgit/emacs/org-mode.git/commit/?id=0ebb36cae
Thanks for your contribution!
--
Ihor Radchenko // yantar92,
Org mode contributor,
Learn more about Org mode at <https://orgmode.org/>.
Support Org development at <https://liberapay.com/org-mode>,
or support my work at <https://liberapay.com/yantar92>
^ permalink raw reply [relevance 8%]
* [ANN] Org mode 9.7 is out
@ 2024-06-02 9:42 4% Ihor Radchenko
2024-06-02 16:30 0% ` Russell Adams
0 siblings, 1 reply; 11+ results
From: Ihor Radchenko @ 2024-06-02 9:42 UTC (permalink / raw)
To: emacs-orgmode
Dear all,
Org 9.7, a major release, is out.
Org 9.7 will be a part of Emacs 30.
You can upgrade from GNU ELPA or install with M-x package-install RET org RET
Please, also re-install all the Org-related packages - some of the
changes require re-compiling packages that use Org mode APIs.
Org 9.7 added a number of new features and customizations, all listed on
<https://orgmode.org/Changes.html>.
If you enjoy using Org, please consider supporting contributors via
<https://liberapay.com/org-mode/>. Donations do help a lot.
* Some highlights of user-facing additions
- Org mode supports drag-and-drop and pasting images/files from
clipboard (pasting from clipboard requires Emacs >=29)
Thanks to Visuwesh for contributing these features.
- id: links support search options like [[id:my-id::*child heading]]:
Any valid fuzzy location will work as a search option.
Contributed by Rick Lupton.
- Org mode honors ~display-buffer-alist~ settings for window placement
- Shell code blocks support asynchronous evaluation
Contributed by Matthew Trzcinski, the new ob-shell maintainer.
- iCalendar export now handles recurring tasks
Contributed by Jack Kamm, the new ox-icalendar maintainer.
- Face background in folded headings and blocks can extend to the right
margin. This is a small, tricky, but widely requested feature.
- Moving, promoting, and demoting headings/items honors region.
You can now conveniently select multiple headings/items and use, for
example, =M-<down>=/=M-<up>= repeatedly without losing the selection.
* Important changes in Org parser
Library authors and Elisp hackers, please pay attention to major changes
of Org parser API:
1. Parser uses lazy evaluation by default, for speed
2. Many Org mode functions can accept parser objects (or return value of
`org-element-at-point' as arguments)
As a result of these changes, internal representation of Org parse tree
has been changed. Please use Org element API to access element/object
internals. All the details in <https://orgmode.org/Changes.html>.
* Development updates
I would also like to welcome new maintainers of Org mode libraries:
- Daniel Kraus is maintaining ob-sql and ob-clojure
- Matthew Trzcinski is maintaining ob-shell
- Jack Kamm is maintaining ox-icalendar (in addition to ob-python that
he has been maintaining for the last 4 years)
We are still looking for additional maintainers of individual Org
libraries, especially ox-latex and ox-html. More than half of all the
Org libraries currently do not have any dedicated maintainer. Please
consider volunteering. See
https://orgmode.org/worg/org-maintenance.html#maintainer-role for more
details. Maintaining takes less effort than one may expect (see the
link).
This release was made possible thanks to many volunteer contributors:
Ihor Radchenko, Kyle Meyer, TEC, Matthew Trzcinski, Stefan Kangas, Max
Nikulin, Jack Kamm, Stefan Monnier, Matt Trzcinski, Gerard Vermeulen,
Rudolf Adamkovič, Leo Butler, Bastien Guerry, Morgan Smith, Mattias
Engdegård, Sławomir Grochowski, Aaron L. Zeng, Ilya Chernyshov, Po Lu,
Evgenii Klimov, Bruno BARBIER, Jeremie Juste, Juan Manuel Macias,
Sébastien Miquel, Alexander Adolf, Anand Deopurkar, Daniel Kraus, Eli
Zaretskii, Jens Schmidt, Liu Hui, Nicholas Vollmer, Pedro A. Aranda,
Pedro A. Aranda Gutierrez, Rick Lupton, Ruijie Yu, Andreas Gerler, Arash
Esbati, Basil L. Contovounesios, Damien Cassou, Gautier Ponsinet, Hraban
Luyat, Jonathan Gregory, Justin Vallon, Kevin Brubeck Unhammer, Lee
Thompson, Marco Wahl, Martin Marshall, Nathaniel Nicandro, Pedro Andres
Aranda Gutierrez, Stephen J. Eglen, Tim Ruffing, Visuwesh, Xi Lu, Yuval
Langer, Aaron Madlon-Kay, Akira Kyle, Alan Schmitt, Alexander Gogl,
Alexandre Avanian, Allen Li, Andras Simonyi, Andrew Hyatt, Antero Mejr,
Cook, Malcolm, David Masterson, Detlef Steuer, Dmitry Gutov, Dmitry
Logvinenko, Elias Kueny, Emacs User, Eric S Fraga, Feraidoon Mehri, Hugo
Heagren, Hunter Jozwiak, Jakub Ječmínek, Jan Zavitski, Jim Porter, Jim
Wisniewski, Joris Caravati, Joseph Turner, José Miguel García Urrutia,
Karl Fogel, Karthik Chikmagalur, Kenny Ballou, Kris Nelson, Laurence
Warne, Lei Zhe, Marc Nieper-Wißkirchen, Martin Edström, Martin Kampas,
Nafiz Islam, Nan JunJie, Nick Dokos, Olivier Lischer, Pedro A. Aranda
Gutiérrez, PolishEmacsUser, Psionik K, Robert Pluim, Roshan Shariff,
Ross Timson, Shynur, Steven Allen, Thierry Banel, Tim Landscheidt, Tim
Visher, Tom Gillespie, Tommy Kelly, Tomohisa Kuranari, Valentin
Herrmann, Zelphir Kaltstahl, hrdl, hugcis, libreville, stardiviner
--
Ihor Radchenko // yantar92,
Org mode contributor,
Learn more about Org mode at <https://orgmode.org/>.
Support Org development at <https://liberapay.com/org-mode>,
or support my work at <https://liberapay.com/yantar92>
^ permalink raw reply [relevance 4%]
* Re: [ANN] Org mode 9.7 is out
2024-06-02 9:42 4% [ANN] Org mode 9.7 is out Ihor Radchenko
@ 2024-06-02 16:30 0% ` Russell Adams
0 siblings, 0 replies; 11+ results
From: Russell Adams @ 2024-06-02 16:30 UTC (permalink / raw)
To: emacs-orgmode
On Sun, Jun 02, 2024 at 09:42:30AM +0000, Ihor Radchenko wrote:
> Dear all,
>
> Org 9.7, a major release, is out.
> This release was made possible thanks to many volunteer contributors:
>
> Ihor Radchenko, Kyle Meyer, TEC, Matthew Trzcinski, Stefan Kangas, Max
> Nikulin, Jack Kamm, Stefan Monnier, Matt Trzcinski, Gerard Vermeulen,
> Rudolf Adamkovič, Leo Butler, Bastien Guerry, Morgan Smith, Mattias
> Engdegård, Sławomir Grochowski, Aaron L. Zeng, Ilya Chernyshov, Po Lu,
> Evgenii Klimov, Bruno BARBIER, Jeremie Juste, Juan Manuel Macias,
> Sébastien Miquel, Alexander Adolf, Anand Deopurkar, Daniel Kraus, Eli
> Zaretskii, Jens Schmidt, Liu Hui, Nicholas Vollmer, Pedro A. Aranda,
> Pedro A. Aranda Gutierrez, Rick Lupton, Ruijie Yu, Andreas Gerler, Arash
> Esbati, Basil L. Contovounesios, Damien Cassou, Gautier Ponsinet, Hraban
> Luyat, Jonathan Gregory, Justin Vallon, Kevin Brubeck Unhammer, Lee
> Thompson, Marco Wahl, Martin Marshall, Nathaniel Nicandro, Pedro Andres
> Aranda Gutierrez, Stephen J. Eglen, Tim Ruffing, Visuwesh, Xi Lu, Yuval
> Langer, Aaron Madlon-Kay, Akira Kyle, Alan Schmitt, Alexander Gogl,
> Alexandre Avanian, Allen Li, Andras Simonyi, Andrew Hyatt, Antero Mejr,
> Cook, Malcolm, David Masterson, Detlef Steuer, Dmitry Gutov, Dmitry
> Logvinenko, Elias Kueny, Emacs User, Eric S Fraga, Feraidoon Mehri, Hugo
> Heagren, Hunter Jozwiak, Jakub Ječmínek, Jan Zavitski, Jim Porter, Jim
> Wisniewski, Joris Caravati, Joseph Turner, José Miguel García Urrutia,
> Karl Fogel, Karthik Chikmagalur, Kenny Ballou, Kris Nelson, Laurence
> Warne, Lei Zhe, Marc Nieper-Wißkirchen, Martin Edström, Martin Kampas,
> Nafiz Islam, Nan JunJie, Nick Dokos, Olivier Lischer, Pedro A. Aranda
> Gutiérrez, PolishEmacsUser, Psionik K, Robert Pluim, Roshan Shariff,
> Ross Timson, Shynur, Steven Allen, Thierry Banel, Tim Landscheidt, Tim
> Visher, Tom Gillespie, Tommy Kelly, Tomohisa Kuranari, Valentin
> Herrmann, Zelphir Kaltstahl, hrdl, hugcis, libreville, stardiviner
Congrats on another successful release! Thank you to everyone who
continues to make Org mode possible!
------------------------------------------------------------------
Russell Adams RLAdams@AdamsInfoServ.com
https://www.adamsinfoserv.com/
^ permalink raw reply [relevance 0%]
* [PATCH] lisp/org-colview.el: Fix for adding appointments to effort sum
@ 2024-09-23 23:23 13% Anand Deopurkar
2024-09-30 0:25 10% ` Anand Deopurkar
0 siblings, 1 reply; 11+ results
From: Anand Deopurkar @ 2024-09-23 23:23 UTC (permalink / raw)
To: emacs-orgmode
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1.1: 0001-lisp-org-colview.el-Bug-fix-for-add-appointments-to-.patch --]
[-- Type: text/x-patch, Size: 3843 bytes --]
From 0b6fbd5bc1326163e16351cee6ee267777e7ecf8 Mon Sep 17 00:00:00 2001
From: Anand Deopurkar <anandrdeopurkar@gmail.com>
Date: Mon, 23 Sep 2024 22:58:48 +1000
Subject: [PATCH] lisp/org-colview.el: Bug fix for
add-appointments-to-effort-sum
* 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
---
lisp/org-colview.el | 21 +++++++++++++++------
1 file changed, 15 insertions(+), 6 deletions(-)
diff --git a/lisp/org-colview.el b/lisp/org-colview.el
index a9eb2e0b6..486badf1e 100644
--- a/lisp/org-colview.el
+++ b/lisp/org-colview.el
@@ -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)
@@ -300,9 +304,13 @@ possible to override it with optional argument COMPILED-FMT."
;; to use appointment duration.
org-agenda-columns-add-appointments-to-effort-sum
(string= p (upcase org-effort-property))
- (get-text-property (point) 'duration)
+ (get-text-property (marker-position agenda-marker)
+ 'duration
+ (marker-buffer agenda-marker))
(propertize (org-duration-from-minutes
- (get-text-property (point) 'duration))
+ (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
@@ -1758,8 +1766,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
--
2.46.0
[-- Attachment #1.2: Type: text/plain, Size: 153 bytes --]
--
Anand Deopurkar
Mathematical Sciences Institute
The Australian National University
Ngunnawal and Ngambri Country
Canberra ACT 2601 Australia
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 231 bytes --]
^ permalink raw reply related [relevance 13%]
* Re: [PATCH] lisp/org-colview.el: Fix for adding appointments to effort sum
2024-09-23 23:23 13% [PATCH] lisp/org-colview.el: Fix for adding appointments to effort sum Anand Deopurkar
@ 2024-09-30 0:25 10% ` Anand Deopurkar
2024-10-12 7:39 8% ` Ihor Radchenko
0 siblings, 1 reply; 11+ results
From: Anand Deopurkar @ 2024-09-30 0:25 UTC (permalink / raw)
To: emacs-orgmode
[-- Attachment #1.1: Type: text/plain, Size: 127 bytes --]
The previous patch contained unmatched parentheses. Sincere apologies. I am attaching a corrected patch.
Best,
Anand
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1.2: 0001-lisp-org-colview.el-Bug-fix-for-add-appointments-to-.patch --]
[-- Type: text/x-patch, Size: 3844 bytes --]
From 7dd9ee45b1ed02de7921efa5c6c2a1c993a1c6ac Mon Sep 17 00:00:00 2001
From: Anand Deopurkar <anandrdeopurkar@gmail.com>
Date: Mon, 30 Sep 2024 10:13:59 +1000
Subject: [PATCH] lisp/org-colview.el: Bug fix for
add-appointments-to-effort-sum
* 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
---
lisp/org-colview.el | 21 +++++++++++++++------
1 file changed, 15 insertions(+), 6 deletions(-)
diff --git a/lisp/org-colview.el b/lisp/org-colview.el
index a9eb2e0b6..f58dc1674 100644
--- a/lisp/org-colview.el
+++ b/lisp/org-colview.el
@@ -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)
@@ -300,9 +304,13 @@ possible to override it with optional argument COMPILED-FMT."
;; to use appointment duration.
org-agenda-columns-add-appointments-to-effort-sum
(string= p (upcase org-effort-property))
- (get-text-property (point) 'duration)
+ (get-text-property (marker-position agenda-marker)
+ 'duration
+ (marker-buffer agenda-marker))
(propertize (org-duration-from-minutes
- (get-text-property (point) 'duration))
+ (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
@@ -1758,8 +1766,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
--
2.46.0
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 231 bytes --]
^ permalink raw reply related [relevance 10%]
* Re: [PATCH] lisp/org-colview.el: Fix for adding appointments to effort sum
2024-09-30 0:25 10% ` Anand Deopurkar
@ 2024-10-12 7:39 8% ` Ihor Radchenko
0 siblings, 0 replies; 11+ results
From: Ihor Radchenko @ 2024-10-12 7:39 UTC (permalink / raw)
To: Anand Deopurkar; +Cc: emacs-orgmode
Anand Deopurkar <anandrdeopurkar@gmail.com> writes:
> Subject: [PATCH] lisp/org-colview.el: Bug fix for
> add-appointments-to-effort-sum
>
> * 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
Thanks!
Applied, onto main, with minor edits to the code and the commit message.
https://git.savannah.gnu.org/cgit/emacs/org-mode.git/commit/?id=e2823be9da
--
Ihor Radchenko // yantar92,
Org mode contributor,
Learn more about Org mode at <https://orgmode.org/>.
Support Org development at <https://liberapay.com/org-mode>,
or support my work at <https://liberapay.com/yantar92>
^ permalink raw reply [relevance 8%]
Results 1-11 of 11 | reverse | options above
-- pct% links below jump to the message on this page, permalinks otherwise --
2024-03-02 10:46 14% [PATCH] org-archive.el: Fix org-add-archive-files to correctly de-duplicate Anand Deopurkar
2024-03-02 12:28 8% ` Ihor Radchenko
2024-03-03 9:12 14% [PATCH] org-agenda.el: Fix org-agenda-write to avoid duplicates Anand Deopurkar
2024-03-03 13:47 8% ` Ihor Radchenko
2024-05-17 11:38 13% [PATCH] lisp/org-capture.el: Restore org-store-link-plist Anand Deopurkar
2024-05-18 10:56 8% ` Ihor Radchenko
2024-06-02 9:42 4% [ANN] Org mode 9.7 is out Ihor Radchenko
2024-06-02 16:30 0% ` Russell Adams
2024-09-23 23:23 13% [PATCH] lisp/org-colview.el: Fix for adding appointments to effort sum Anand Deopurkar
2024-09-30 0:25 10% ` Anand Deopurkar
2024-10-12 7:39 8% ` Ihor Radchenko
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).