From 4f4693a5dd85e09737ecb27a68b04c7f8af014ad Mon Sep 17 00:00:00 2001 Message-Id: <4f4693a5dd85e09737ecb27a68b04c7f8af014ad.1675850882.git.yantar92@posteo.net> From: "Aaron L. Zeng" Date: Tue, 7 Feb 2023 12:47:03 -0500 Subject: [PATCH v2] org--batch-store-agenda-views: Fix treatment of lambda functions * org-agenda.el (org--batch-store-agenda-views): Fix treatment of lambda functions used as custom agenda commands. `org-agenda-custom-commands' entries may specify a custom function instead of a symbol like `tags-todo'. `org--batch-store-agenda-views' behaved differently from `org-agenda' when that custom function was defined as a lambda rather than a symbol, incorrectly treating the lambda form as a list of agenda commands. Instead, use the same test as `org-agenda' does to determine whether the command is a series. TINYCHANGE --- lisp/org-agenda.el | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el index 1d1f2271b..127503af0 100644 --- a/lisp/org-agenda.el +++ b/lisp/org-agenda.el @@ -3525,7 +3525,8 @@ (defun org--batch-store-agenda-views (vars vals) (let ((cmds (org-agenda-normalize-custom-commands org-agenda-custom-commands)) (pop-up-frames nil) (dir default-directory) - cmd thiscmdkey thiscmdcmd match files opts cmd-or-set bufname) + cmd thiscmdkey thiscmdcmd match files opts cmd-or-set + seriesp bufname) (save-window-excursion (while cmds (setq cmd (pop cmds) @@ -3537,9 +3538,12 @@ (defun org--batch-store-agenda-views (vars vals) (format "*Org Agenda(%s:%s)*" thiscmdkey match)) (format "*Org Agenda(%s)*" thiscmdkey)) org-agenda-buffer-name) + ;; series: (0:key 1:desc 2:(cmd1 cmd2 ...) 3:general-settings 4:files) + ;; non-series: (0:key 1:desc 2:type 3:match 4:settings 5:files) cmd-or-set (nth 2 cmd) - opts (nth (if (listp cmd-or-set) 3 4) cmd) - files (nth (if (listp cmd-or-set) 4 5) cmd)) + seriesp (not (or (symbolp cmd-or-set) (functionp cmd-or-set))) + opts (nth (if seriesp 3 4) cmd) + files (nth (if seriesp 4 5) cmd)) (if (stringp files) (setq files (list files))) (when files (let* ((opts (append org-agenda-exporter-settings opts)) -- 2.39.1