Merge from origin/emacs-24

[gnu-emacs] / lisp / calendar / time-date.el

diff --git a/lisp/calendar/time-date.el b/lisp/calendar/time-date.el
index a9c30f41f6a244c858b3980be06eb6f64271bce8..bb7e97ea7f32b7c049c19c9be732a6b5a84e15f8 100644 (file)
--- a/lisp/calendar/time-date.el
+++ b/lisp/calendar/time-date.el
@@ -1,6 +1,6 @@
 ;;; time-date.el --- Date and time handling functions
 
-;; Copyright (C) 1998-2014 Free Software Foundation, Inc.
+;; Copyright (C) 1998-2015 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;;     Masanobu Umeda <umerin@mse.kyutech.ac.jp>
@@ -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)