Do not use figlet fancy stuff on week agenda

master
Jacopo De Simoi 3 years ago
parent d6c837cec6
commit 28db0c70d8
  1. 59
      global.org

@ -1151,34 +1151,37 @@
"Format a DATE string for display in the daily/weekly agenda. "Format a DATE string for display in the daily/weekly agenda.
This function makes sure that dates are aligned for easy reading." This function makes sure that dates are aligned for easy reading."
;(require 'cal-iso) ;(require 'cal-iso)
(let* ((dayname (calendar-day-name date)) (if (not (eq 'day org-agenda-current-span))
(day (cadr date)) (concat "\n" (org-agenda-format-date-aligned date)
(day-of-week (calendar-day-of-week date)) " ────────────────────────────────────────────────────\n")
(month (car date)) (let* ((dayname (calendar-day-name date))
(monthname (calendar-month-name month)) (day (cadr date))
(year (nth 2 date))nf (day-of-week (calendar-day-of-week date))
(iso-week (org-days-to-iso-week (month (car date))
(calendar-absolute-from-gregorian date))) (monthname (calendar-month-name month))
(weekyear (cond ((and (= month 1) (>= iso-week 52)) (year (nth 2 date))nf
(1- year)) (iso-week (org-days-to-iso-week
((and (= month 12) (<= iso-week 1)) (calendar-absolute-from-gregorian date)))
(1+ year)) (weekyear (cond ((and (= month 1) (>= iso-week 52))
(t year))) (1- year))
(weekstring (if (= day-of-week 1) ((and (= month 12) (<= iso-week 1))
(format " W%02d" iso-week) (1+ year))
""))) (t year)))
(weekstring (if (= day-of-week 1)
(format (concat "\n" (format " W%02d" iso-week)
"%9s %s %4d%s\n" "")))
"%9s \n"
"%9s %-10s\n" (format (concat "\n"
"%9s \n" "%9s %s %4d%s\n"
"%9s %s\n") "%9s \n"
(figlet-num day 0) monthname year weekstring "%9s %-10s\n"
(figlet-num day 1) "%9s \n"
(figlet-num day 2) dayname "%9s %s\n")
(figlet-num day 3) (figlet-num day 0) monthname year weekstring
(figlet-num day 4) (sunrise-sunset)))) (figlet-num day 1)
(figlet-num day 2) dayname
(figlet-num day 3)
(figlet-num day 4) (sunrise-sunset)))))
(setq org-agenda-format-date #'org-agenda-format-date-figlet) (setq org-agenda-format-date #'org-agenda-format-date-figlet)
(setq org-agenda-prefix-format (setq org-agenda-prefix-format

Loading…
Cancel
Save