Port new time stamp handling to Emacs 23.2.

This fix is for Gnus.  Problem reported by Katsumi Yamaoka.
* calendar/time-date.el (time-add, time-subtract, time-less-p):
Use eval-and-compile, not eval-when-compile.

2 files changed, 8 insertions, 1 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 2670a66a7c7..feb93854eea 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
+2014-11-18  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Port new time stamp handling to Emacs 23.2.
+        This fix is for Gnus.  Problem reported by Katsumi Yamaoka.
+        * calendar/time-date.el (time-add, time-subtract, time-less-p):
+        Use eval-and-compile, not eval-when-compile.
+
 2014-11-18  Daiki Ueno  <ueno@gnu.org>
 
         * epg.el (epg-context-set-passphrase-callback)
diff --git a/lisp/calendar/time-date.el b/lisp/calendar/time-date.el
index a9c30f41f6a..e7a8cc7eb25 100644
--- a/lisp/calendar/time-date.el
+++ b/lisp/calendar/time-date.el
@@ -215,7 +215,7 @@ TIME should be either a time value or a date-time string."
 ;;;###autoload(autoload 'time-subtract "time-date")
 ;;;###autoload(autoload 'time-less-p "time-date")
 
-(eval-when-compile
+(eval-and-compile
   (when (not (and (fboundp 'time-add) (subrp (symbol-function 'time-add))))
 
     (defun time-add (t1 t2)