Просмотр исходного кода

Fix to the habit consistency graph builder

John Wiegley 16 лет назад
Родитель
Сommit
14ac7bef8b
2 измененных файлов с 7 добавлено и 4 удалено
  1. 3 0
      lisp/ChangeLog
  2. 4 4
      lisp/org-habit.el

+ 3 - 0
lisp/ChangeLog

@@ -14,6 +14,9 @@
 
 
 2009-10-22  John Wiegley  <jwiegley@gmail.com>
 2009-10-22  John Wiegley  <jwiegley@gmail.com>
 
 
+	* org-habit.el (org-habit-build-graph): Fix to the graph building
+	when last DONE date is earlier than `org-habit-preceding-days'.
+
 	* org-clock.el (org-resolve-clocks-if-idle): Fix to the way idle
 	* org-clock.el (org-resolve-clocks-if-idle): Fix to the way idle
 	time is reported after the user comes back (but before they
 	time is reported after the user comes back (but before they
 	resolve time).
 	resolve time).

+ 4 - 4
lisp/org-habit.el

@@ -278,10 +278,10 @@ Habits are assigned colors on the following basis:
 	(graph (make-string (1+ (- (time-to-days ending)
 	(graph (make-string (1+ (- (time-to-days ending)
 				   (time-to-days starting))) ?\ ))
 				   (time-to-days starting))) ?\ ))
 	(index 0))
 	(index 0))
-    (if done-dates
-	(while (time-less-p (car done-dates) starting)
-	  (setq last-done-date (car done-dates)
-		done-dates (cdr done-dates))))
+    (while (and done-dates
+		(time-less-p (car done-dates) starting))
+      (setq last-done-date (car done-dates)
+	    done-dates (cdr done-dates)))
     (while (time-less-p day ending)
     (while (time-less-p day ending)
       (let* ((now-days (time-to-days day))
       (let* ((now-days (time-to-days day))
 	     (in-the-past-p (< now-days current-days))
 	     (in-the-past-p (< now-days current-days))