From: John Wiegley <johnw@newartisans.com>
Date: Thu, 10 May 2001 02:46:38 +0000 (+0000)
Subject: One more variable coming up nil on the first time around, needing
X-Git-Tag: emacs-pretest-21.0.104~565
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=8c9245e2a54cd48a693adfbd3a2b34f2168c4e45;p=emacs.git

One more variable coming up nil on the first time around, needing
guarding.
---

diff --git a/lisp/calendar/timeclock.el b/lisp/calendar/timeclock.el
index a054513441c..e570f9bf2f7 100644
--- a/lisp/calendar/timeclock.el
+++ b/lisp/calendar/timeclock.el
@@ -1080,7 +1080,7 @@ See the documentation for the given function if more info is needed."
     (unless timeclock-last-event-workday
       (setq timeclock-last-event-workday timeclock-workday))
     (setq accum timeclock-discrepancy
-	  elapsed timeclock-elapsed)
+	  elapsed (or timeclock-elapsed elapsed))
     (if timeclock-last-event
 	(if (equal (car timeclock-last-event) "i")
 	    (let ((last-period (timeclock-last-period now)))