Browse Source

Clean up compiler messages.

Carsten Dominik 17 years ago
parent
commit
1ef8e3ea1d
2 changed files with 6 additions and 5 deletions
  1. 3 0
      ChangeLog
  2. 3 5
      org.el

+ 3 - 0
ChangeLog

@@ -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>
 
 

+ 3 - 5
org.el

@@ -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
-		    (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))
 	 (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)