From 1ef8e3ea1d63a9e53318f728c2bc70bdf26c7069 Mon Sep 17 00:00:00 2001 From: Carsten Dominik Date: Thu, 20 Mar 2008 10:49:22 +0100 Subject: [PATCH] Clean up compiler messages. --- ChangeLog | 3 +++ org.el | 8 +++----- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 29993ff89..d820e9464 100644 --- a/ChangeLog +++ b/ChangeLog @@ -4,6 +4,9 @@ (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). + (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 diff --git a/org.el b/org.el index 84991c30f..f63d4e73d 100644 --- a/org.el +++ b/org.el @@ -2879,10 +2879,8 @@ This function makes sure that dates are aligned for easy reading." (month (extract-calendar-month date)) (monthname (calendar-month-name month)) (year (extract-calendar-year date)) - (iso-week (string-to-number - (format-time-string - "%V" (calendar-time-from-absolute - (calendar-absolute-from-gregorian date) 1)))) + (iso-week (org-days-to-iso-week + (calendar-absolute-from-gregorian date))) (weekyear (cond ((and (= month 1) (>= iso-week 52)) (1- year)) ((and (= month 12) (<= iso-week 1)) @@ -17674,7 +17672,7 @@ user." ;; FIXME: cleanup and comment (let (delta deltan deltaw deltadef year month day 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)) (setq ans (replace-match "" t t ans)