tec/org-mode
tec/org-mode
1
0
Fork 0
forked from mirrors/org-mode
Code Pull requests Releases Activity

Clean up compiler messages.

Browse source
This commit is contained in:
Carsten Dominik 2008-03-20 10:49:22 +01:00
parent 4916600ca6
commit 1ef8e3ea1d
2 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
ChangeLog
View file

@ -4,6 +4,9 @@
(org-agenda-format-date-aligned): Require `cal-iso'. (org-agenda-format-date-aligned): Require `cal-iso'.
(org-agenda-list): Include week into into agenda heading, don't (org-agenda-list): Include week into into agenda heading, don't
list it at each date (only on Mondays). list it at each date (only on Mondays).
(org-read-date-analyze): Define local variable `iso-date'.
(org-agenda-format-date-aligned): Remove dependency on
`calendar-time-from-absolute'.
2008-03-19 Bastien Guerry <bzg@altern.org> 2008-03-19 Bastien Guerry <bzg@altern.org>

8
org.el
View file

@ -2879,10 +2879,8 @@ This function makes sure that dates are aligned for easy reading."
(month (extract-calendar-month date)) (month (extract-calendar-month date))
(monthname (calendar-month-name month)) (monthname (calendar-month-name month))
(year (extract-calendar-year date)) (year (extract-calendar-year date))
(iso-week (string-to-number (iso-week (org-days-to-iso-week
(format-time-string (calendar-absolute-from-gregorian date)))
"%V" (calendar-time-from-absolute
(calendar-absolute-from-gregorian date) 1))))
(weekyear (cond ((and (= month 1) (>= iso-week 52)) (weekyear (cond ((and (= month 1) (>= iso-week 52))
(1- year)) (1- year))
((and (= month 12) (<= iso-week 1)) ((and (= month 12) (<= iso-week 1))
@ -17674,7 +17672,7 @@ user."
;; FIXME: cleanup and comment ;; FIXME: cleanup and comment
(let (delta deltan deltaw deltadef year month day (let (delta deltan deltaw deltadef year month day
hour minute second wday pm h2 m2 tl wday1 hour minute second wday pm h2 m2 tl wday1
iso-year iso-weekday iso-week iso-year) iso-year iso-weekday iso-week iso-year iso-date)
(when (setq delta (org-read-date-get-relative ans (current-time) def)) (when (setq delta (org-read-date-get-relative ans (current-time) def))
(setq ans (replace-match "" t t ans) (setq ans (replace-match "" t t ans)