From 1501630b9fa6e3bbf65f384f0ada00fc3984926e Mon Sep 17 00:00:00 2001 From: Stefan Kangas Date: Wed, 12 Feb 2025 18:33:59 +0100 Subject: [PATCH] Avoid cl-caaar etc. compatibility macros in Org * lisp/org/ob-core.el (org-babel-process-params): * lisp/org/org-agenda.el (org-agenda-span-to-ndays): * lisp/org/org-capture.el (org-capture-set-target-location): * lisp/org/org.el (org-set-effort): Don't use cl-caaar, cl-caadr, etc. compatibility macros in Org. We don't need to use them, since Org requires Emacs 26.1. (cherry picked from commit a669e6a37610f78115f473176f3914cea4c20fb2) --- lisp/org/ob-core.el | 2 +- lisp/org/org-agenda.el | 4 ++-- lisp/org/org-capture.el | 2 +- lisp/org/org.el | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/lisp/org/ob-core.el b/lisp/org/ob-core.el index 1c804ca9eea..b907df2433b 100644 --- a/lisp/org/ob-core.el +++ b/lisp/org/ob-core.el @@ -1822,7 +1822,7 @@ HEADER-ARGUMENTS is an alist of all the arguments." (cons :colname-names (or (cdr (assq :colname-names params)) (cadr vars-and-names))) (cons :rowname-names (or (cdr (assq :rowname-names params)) - (cl-caddr vars-and-names))) + (caddr vars-and-names))) (cons :result-params result-params) (cons :result-type (cond ((member "output" result-params) 'output) ((member "value" result-params) 'value) diff --git a/lisp/org/org-agenda.el b/lisp/org/org-agenda.el index 4691dc0bdd3..c6c040e8c3a 100644 --- a/lisp/org/org-agenda.el +++ b/lisp/org/org-agenda.el @@ -4605,10 +4605,10 @@ START-DAY is an absolute time value." ((eq span 'fortnight) 14) ((eq span 'month) (let ((date (calendar-gregorian-from-absolute start-day))) - (calendar-last-day-of-month (car date) (cl-caddr date)))) + (calendar-last-day-of-month (car date) (caddr date)))) ((eq span 'year) (let ((date (calendar-gregorian-from-absolute start-day))) - (if (calendar-leap-year-p (cl-caddr date)) 366 365))))) + (if (calendar-leap-year-p (caddr date)) 366 365))))) (defun org-agenda-span-name (span) "Return a SPAN name." diff --git a/lisp/org/org-capture.el b/lisp/org/org-capture.el index 9c4a4619bbd..0720ad53cc7 100644 --- a/lisp/org/org-capture.el +++ b/lisp/org/org-capture.el @@ -1100,7 +1100,7 @@ Store them in the capture property list." (org-encode-time (apply #'list 0 0 org-extend-today-until - (cl-cdddr (decode-time prompt-time)))))) + (cdddr (decode-time prompt-time)))))) (time-to-days prompt-time))) (t ;; Current date, possibly corrected for late night diff --git a/lisp/org/org.el b/lisp/org/org.el index ca07b16c707..c2b80b18fab 100644 --- a/lisp/org/org.el +++ b/lisp/org/org.el @@ -12799,7 +12799,7 @@ variables is set." (cond (increment (unless allowed (user-error "Allowed effort values are not set")) - (or (cl-caadr (member (list current) allowed)) + (or (caadr (member (list current) allowed)) (user-error "Unknown value %S among allowed values" current))) (value (if (stringp value) value -- 2.39.5