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.
This commit is contained in:
parent
d5f788e016
commit
a669e6a376
4 changed files with 5 additions and 5 deletions
|
@ -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)
|
||||
|
|
|
@ -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."
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Add table
Reference in a new issue