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)

diff --git a/lisp/org/ob-core.el b/lisp/org/ob-core.el
index 1c804ca9eea24c15f63b84ca56689250f175ee8f..b907df2433bdf236b49c0de2ae4de58c14c5cfc9 100644 (file)
--- 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 4691dc0bdd38797dcdcd7b245e5373aa80d5d8d7..c6c040e8c3a657a9e31ac8bfcde88634b4b4d4f9 100644 (file)
--- 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 9c4a4619bbd5c6efbb616634d4f7b3493d0a1346..0720ad53cc79bd039bd32482591c70d01eae3bc4 100644 (file)
--- 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 ca07b16c707eed2d0ae8779ba065bd7da01c9c24..c2b80b18fab3ec80089eab6bc5483c755f6df0f9 100644 (file)
--- 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