mirror/org-mode
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs/org-mode.git synced 2025-01-03 11:33:46 +00:00
Code

Reduce the cluttering in the agenda display due to ISO weeks.

Browse Source
This commit is contained in:
Carsten Dominik 2008-03-20 10:35:28 +01:00
parent e2eba8640f
commit 4916600ca6
2 changed files with 25 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -2,6 +2,8 @@
* org.el (org-agenda-compute-time-span): Make argument N optional.
(org-agenda-format-date-aligned): Require `cal-iso'.
(org-agenda-list): Include week into into agenda heading, don't
list it at each date (only on Mondays).
2008-03-19 Bastien Guerry <bzg@altern.org>

35
org.el
View File

@ -2875,8 +2875,7 @@ This function makes sure that dates are aligned for easy reading."
(require 'cal-iso)
(let* ((dayname (calendar-day-name date))
(day (extract-calendar-day date))
(day-of-week0 (calendar-day-of-week date))
(day-of-week (if (= day-of-week0 0) 7 day-of-week0))
(day-of-week (calendar-day-of-week date))
(month (extract-calendar-month date))
(monthname (calendar-month-name month))
(year (extract-calendar-year date))
@ -2889,13 +2888,10 @@ This function makes sure that dates are aligned for easy reading."
((and (= month 12) (<= iso-week 1))
(1+ year))
(t year)))
(weekstring (if (= year weekyear)
(format "W%02d %d" iso-week day-of-week)
(format "%4d-W%02d %d" weekyear iso-week day-of-week))))
(setq weekstring (concat (make-string (max 0 (- 12 (length monthname)))
?\ )
weekstring))
(format "%-9s %2d %s %4d %s"
(weekstring (if (= day-of-week 1)
(format " W%02d" iso-week)
"")))
(format "%-9s %2d %s %4d%s"
dayname day monthname year weekstring)))
(defcustom org-agenda-include-diary nil
@ -20775,9 +20771,19 @@ given in `org-agenda-start-on-weekday'."
(list 'face 'org-agenda-structure))
(insert (org-finalize-agenda-entries rtnall) "\n")))
(unless org-agenda-compact-blocks
(setq s (point))
(insert (capitalize (symbol-name (org-agenda-ndays-to-span nd)))
"-agenda:\n")
(let* ((d1 (car day-numbers))
(d2 (org-last day-numbers))
(w1 (org-days-to-iso-week d1))
(w2 (org-days-to-iso-week d2)))
(setq s (point))
(insert (capitalize (symbol-name (org-agenda-ndays-to-span nd)))
"-agenda"
(if (< (- d2 d1) 350)
(if (= w1 w2)
(format " (W%02d)" w1)
(format " (W%02d-W%02d)" w1 w2))
"")
":\n"))
(add-text-properties s (1- (point)) (list 'face 'org-agenda-structure
'org-date-line t)))
(while (setq d (pop day-numbers))
@ -22697,6 +22703,11 @@ so that the date SD will be in that range."
sd))))
(cons sd nd)))
(defun org-days-to-iso-week (days)
"Return the iso week number."
(require 'cal-iso)
(car (calendar-iso-from-absolute days)))
(defun org-small-year-to-year (year)
"Convert 2-digit years into 4-digit years.
38-99 are mapped into 1938-1999. 1-37 are mapped into 2001-2007.