mirror of
https://git.savannah.gnu.org/git/emacs/org-mode.git
synced 2024-08-24 10:19:14 +00:00
replacing cl concatenate with concat
* lisp/org-clock.el (org-clock-special-range): Replacing cl concatenate with concat. (org-clocktable-shift): Replacing cl concatenate with concat.
This commit is contained in:
parent
64418e2920
commit
d7a8b6636a
|
@ -2031,7 +2031,7 @@ the returned times will be formatted strings."
|
||||||
((memq key '(year thisyear))
|
((memq key '(year thisyear))
|
||||||
(setq txt (format-time-string "the year %Y" ts)))
|
(setq txt (format-time-string "the year %Y" ts)))
|
||||||
((memq key '(quarter thisq))
|
((memq key '(quarter thisq))
|
||||||
(setq txt (concatenate 'string (org-count-quarter shiftedq) " quarter of " (number-to-string shiftedy))))
|
(setq txt (concat 'string (org-count-quarter shiftedq) " quarter of " (number-to-string shiftedy))))
|
||||||
)
|
)
|
||||||
(if as-strings
|
(if as-strings
|
||||||
(list (format-time-string fm ts) (format-time-string fm te) txt)
|
(list (format-time-string fm ts) (format-time-string fm te) txt)
|
||||||
|
@ -2109,7 +2109,7 @@ the currently selected interval size."
|
||||||
(setq date (calendar-gregorian-from-absolute
|
(setq date (calendar-gregorian-from-absolute
|
||||||
(calendar-absolute-from-iso (org-quarter-to-date (+ mw n) y))))
|
(calendar-absolute-from-iso (org-quarter-to-date (+ mw n) y))))
|
||||||
(setq ins (format-time-string
|
(setq ins (format-time-string
|
||||||
(concatenate 'string (number-to-string y) "-Q" (number-to-string (+ mw n)))
|
(concat 'string (number-to-string y) "-Q" (number-to-string (+ mw n)))
|
||||||
(encode-time 0 0 0 (nth 1 date) (car date) (nth 2 date)))))
|
(encode-time 0 0 0 (nth 1 date) (car date) (nth 2 date)))))
|
||||||
(mw
|
(mw
|
||||||
(setq ins (format-time-string
|
(setq ins (format-time-string
|
||||||
|
|
Loading…
Reference in a new issue