branch: externals/org
commit b768752d2e5f9047739a17ed4b620ee0c9c8956e
Author: Stefan Kangas <stefankan...@gmail.com>
Commit: Kyle Meyer <k...@kyleam.com>
Backport commit a669e6a37 from Emacs
* lisp/ob-core.el (org-babel-process-params):
* lisp/org-agenda.el (org-agenda-span-to-ndays):
* lisp/org-capture.el (org-capture-set-target-location):
* lisp/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.
Avoid cl-caaar etc. compatibility macros in Org
a669e6a37610f78115f473176f3914cea4c20fb2
Stefan Kangas
Wed Feb 12 21:30:47 2025 +0100
---
lisp/ob-core.el | 2 +-
lisp/org-agenda.el | 4 ++--
lisp/org-capture.el | 2 +-
lisp/org.el | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/lisp/ob-core.el b/lisp/ob-core.el
index 88d2f26df0..7d5677da5d 100644
--- a/lisp/ob-core.el
+++ b/lisp/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-agenda.el b/lisp/org-agenda.el
index 8fdd998fc5..50dbb6dbed 100644
--- a/lisp/org-agenda.el
+++ b/lisp/org-agenda.el
@@ -4603,10 +4603,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-capture.el b/lisp/org-capture.el
index 9c4a4619bb..0720ad53cc 100644
--- a/lisp/org-capture.el
+++ b/lisp/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.el b/lisp/org.el
index ab5316a0b1..56a8d11e1a 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -12800,7 +12800,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
