* [PATCH] lisp/org/org-agenda.el (org-todo-list): rename variables and format
@ 2023-12-26 17:44 Nafiz Islam
2024-01-04 15:04 ` Ihor Radchenko
0 siblings, 1 reply; 2+ messages in thread
From: Nafiz Islam @ 2023-12-26 17:44 UTC (permalink / raw)
To: emacs-orgmode
[-- Attachment #1.1: Type: text/plain, Size: 1 bytes --]
[-- Attachment #1.2: Type: text/html, Size: 26 bytes --]
[-- Attachment #2: 0001-lisp-org-org-agenda.el-org-todo-list-rename-variable.patch --]
[-- Type: text/x-patch, Size: 5207 bytes --]
From dfd86feb0baa7075b58507e3b8bf3b3a958b0f79 Mon Sep 17 00:00:00 2001
From: Nafiz Islam <nafiz.islam1001@gmail.com>
Date: Tue, 26 Dec 2023 12:34:20 -0500
Subject: [PATCH] lisp/org/org-agenda.el (org-todo-list): rename variables and format
* lisp/org/org-agenda.el
(org-todo-list): Use `org-today' directly for `calendar-gregorian-from-absolute'
(org-todo-list): Replace `date' with `today' (`date' is no longer used)
(org-todo-list): Replace `kwds' with `todo-keywords'
(org-todo-list): Replace `rtn' with `todo-entries'
(org-todo-list): Replace `rtnall' with `all-todo-entries'
(org-todo-list): Replace some `and' with `when' and `cond'
(org-todo-list): Some whitespace changes
TINYCHANGE
---
lisp/org-agenda.el | 42 +++++++++++++++++++++---------------------
1 file changed, 21 insertions(+), 21 deletions(-)
diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el
index a1b2f3dc4..2dcaef723 100644
--- a/lisp/org-agenda.el
+++ b/lisp/org-agenda.el
@@ -4958,48 +4958,48 @@ for a keyword. A numeric prefix directly selects the Nth keyword in
(interactive "P")
(when org-agenda-overriding-arguments
(setq arg org-agenda-overriding-arguments))
- (when (and (stringp arg) (not (string-match "\\S-" arg))) (setq arg nil))
- (let* ((today (org-today))
- (date (calendar-gregorian-from-absolute today))
+ (when (and (stringp arg) (not (string-match "\\S-" arg)))
+ (setq arg nil))
+ (let* ((today (calendar-gregorian-from-absolute (org-today)))
(completion-ignore-case t)
- kwds org-select-this-todo-keyword rtn rtnall files file pos)
+ todo-keywords org-select-this-todo-keyword todo-entries all-todo-entries files file pos)
(catch 'exit
(setq org-agenda-buffer-name
(org-agenda--get-buffer-name
- (and org-agenda-sticky
+ (when org-agenda-sticky
(if (stringp org-select-this-todo-keyword)
(format "*Org Agenda(%s:%s)*" (or org-keys "t")
org-select-this-todo-keyword)
(format "*Org Agenda(%s)*" (or org-keys "t"))))))
(org-agenda-prepare "TODO")
- (setq kwds org-todo-keywords-for-agenda
- org-select-this-todo-keyword (if (stringp arg) arg
- (and (integerp arg)
- (> arg 0)
- (nth (1- arg) kwds))))
+ (setq todo-keywords org-todo-keywords-for-agenda
+ org-select-this-todo-keyword (cond ((stringp arg) arg)
+ ((and (integerp arg) (> arg 0))
+ (nth (1- arg) todo-keywords))))
(when (equal arg '(4))
(setq org-select-this-todo-keyword
(mapconcat #'identity
(let ((crm-separator "|"))
(completing-read-multiple
"Keyword (or KWD1|KWD2|...): "
- (mapcar #'list kwds) nil nil))
+ (mapcar #'list todo-keywords) nil nil))
"|")))
- (and (equal 0 arg) (setq org-select-this-todo-keyword nil))
+ (when (equal arg 0)
+ (setq org-select-this-todo-keyword nil))
(org-compile-prefix-format 'todo)
(org-set-sorting-strategy 'todo)
(setq org-agenda-redo-command
- `(org-todo-list (or (and (numberp current-prefix-arg)
- current-prefix-arg)
+ `(org-todo-list (or (and (numberp current-prefix-arg) current-prefix-arg)
,org-select-this-todo-keyword
- current-prefix-arg ,arg)))
+ current-prefix-arg
+ ,arg)))
(setq files (org-agenda-files nil 'ifmode)
- rtnall nil)
+ all-todo-entries nil)
(while (setq file (pop files))
(catch 'nextfile
(org-check-agenda-file file)
- (setq rtn (org-agenda-get-day-entries file date :todo))
- (setq rtnall (append rtnall rtn))))
+ (setq todo-entries (org-agenda-get-day-entries file today :todo))
+ (setq all-todo-entries (append all-todo-entries todo-entries))))
(org-agenda--insert-overriding-header
(with-temp-buffer
(insert "Global list of TODO items of type: ")
@@ -5017,7 +5017,7 @@ for a keyword. A numeric prefix directly selects the Nth keyword in
\\<org-agenda-mode-map>`N \\[org-agenda-redo]' (e.g. `0 \\[org-agenda-redo]') \
to search again: (0)[ALL]"))
(let ((n 0))
- (dolist (k kwds)
+ (dolist (k todo-keywords)
(let ((s (format "(%d)%s" (cl-incf n) k)))
(when (> (+ (current-column) (string-width s) 1) (window-max-chars-per-line))
(insert "\n "))
@@ -5026,8 +5026,8 @@ to search again: (0)[ALL]"))
(add-text-properties pos (1- (point)) (list 'face 'org-agenda-structure-secondary))
(buffer-string)))
(org-agenda-mark-header-line (point-min))
- (when rtnall
- (insert (org-agenda-finalize-entries rtnall 'todo) "\n"))
+ (when all-todo-entries
+ (insert (org-agenda-finalize-entries all-todo-entries 'todo) "\n"))
(goto-char (point-min))
(or org-agenda-multi (org-agenda-fit-window-to-buffer))
(add-text-properties (point-min) (point-max)
--
2.34.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] lisp/org/org-agenda.el (org-todo-list): rename variables and format
2023-12-26 17:44 [PATCH] lisp/org/org-agenda.el (org-todo-list): rename variables and format Nafiz Islam
@ 2024-01-04 15:04 ` Ihor Radchenko
0 siblings, 0 replies; 2+ messages in thread
From: Ihor Radchenko @ 2024-01-04 15:04 UTC (permalink / raw)
To: Nafiz Islam; +Cc: emacs-orgmode
Nafiz Islam <nafiz.islam1001@gmail.com> writes:
> Subject: [PATCH] lisp/org/org-agenda.el (org-todo-list): rename variables and format
Thanks!
Applied, onto main, with minor amendments to the commit message.
https://git.savannah.gnu.org/cgit/emacs/org-mode.git/commit/?id=a27a1b87b
I also listed you in the contributor list.
https://git.sr.ht/~bzg/worg/commit/9a35110c
--
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 [flat|nested] 2+ messages in thread
end of thread, other threads:[~2024-01-04 15:02 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-12-26 17:44 [PATCH] lisp/org/org-agenda.el (org-todo-list): rename variables and format Nafiz Islam
2024-01-04 15:04 ` 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).