3 files changed, 44 insertions, 14 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e55f23fa0db..a173f58335a 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,18 @@
+2009-09-09  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+        * calendar/time-date.el (autoload):
+        Expand define-obsolete-function-alias into defalias and make-obsolete
+        for old Emacsen that Gnus supports.
+        (with-no-warnings): Define it for old Emacsen.
+        (time-to-seconds): Don't use (featurep 'xemacs) to check if float-time
+        is available.
+        (time-to-number-of-days): Don't use (featurep 'xemacs) to check if
+        float-time is available; suppress compile warning for time-to-seconds.
+
+2009-09-09  Teodor Zlatanov  <tzz@lifelogs.com>
+
+        * net/imap.el (imap-message-map): Docstring fix.
+
 2009-09-09  Glenn Morris  <rgm@gnu.org>
 
         * ffap.el (ffap-file-at-point): Handle absolute (non-remote) files with
diff --git a/lisp/calendar/time-date.el b/lisp/calendar/time-date.el
index 4521398d2d4..ec0c8dc8bee 100644
--- a/lisp/calendar/time-date.el
+++ b/lisp/calendar/time-date.el
@@ -114,17 +114,27 @@ and type 2 is the list (HIGH LOW MICRO)."
 ;; Bit of a mess.  Emacs has float-time since at least 21.1.
 ;; This file is synced to Gnus, and XEmacs packages may have been written
 ;; using time-to-seconds from the Gnus library.
-;;;###autoload(if (featurep 'xemacs)
-;;;###autoload     (autoload 'time-to-seconds "time-date")
-;;;###autoload   (define-obsolete-function-alias 'time-to-seconds 'float-time "21.1"))
-
-(if (featurep 'xemacs)
+;;;###autoload(if (and (fboundp 'float-time)
+;;;###autoload         (subrp (symbol-function 'float-time)))
+;;;###autoload    (progn
+;;;###autoload      (defalias 'time-to-seconds 'float-time)
+;;;###autoload      (make-obsolete 'time-to-seconds 'float-time "21.1"))
+;;;###autoload  (autoload 'time-to-seconds "time-date"))
+
+(eval-and-compile
+  (unless (and (fboundp 'float-time)
+               (subrp (symbol-function 'float-time)))
     (defun time-to-seconds (time)
       "Convert time value TIME to a floating point number."
       (with-decoded-time-value ((high low micro time))
-        (+ (* 1.0 high 65536)
-           low
-           (/ micro 1000000.0)))))
+        (+ (* 1.0 high 65536)
+           low
+           (/ micro 1000000.0))))))
+
+(eval-when-compile
+  (unless (fboundp 'with-no-warnings)
+    (defmacro with-no-warnings (&rest body)
+      `(progn ,@body))))
 
 ;;;###autoload
 (defun seconds-to-time (seconds)
@@ -248,12 +258,17 @@ The Gregorian date Sunday, December 31, 1bce is imaginary."
        (- (/ (1- year) 100))            ;       - century years
        (/ (1- year) 400))))             ;       + Gregorian leap years
 
-(defun time-to-number-of-days (time)
-  "Return the number of days represented by TIME.
+(eval-and-compile
+  (if (and (fboundp 'float-time)
+           (subrp (symbol-function 'float-time)))
+      (defun time-to-number-of-days (time)
+        "Return the number of days represented by TIME.
+The number of days will be returned as a floating point number."
+        (/ (float-time time) (* 60 60 24)))
+    (defun time-to-number-of-days (time)
+      "Return the number of days represented by TIME.
 The number of days will be returned as a floating point number."
-  (/ (if (featurep 'xemacs)
-         (time-to-seconds time)
-       (float-time time)) (* 60 60 24)))
+      (/ (with-no-warnings (time-to-seconds time)) (* 60 60 24)))))
 
 ;;;###autoload
 (defun safe-date-to-time (date)
diff --git a/lisp/net/imap.el b/lisp/net/imap.el
index fb5dc2ac60c..6393e8a5c90 100644
--- a/lisp/net/imap.el
+++ b/lisp/net/imap.el
@@ -1689,7 +1689,7 @@ is non-nil return these properties."
          propname)))
 
 (defun imap-message-map (func propname &optional buffer)
-  "Map a function across each mailbox in `imap-message-data', returning a list."
+  "Map a function across each message in `imap-message-data', returning a list."
   (with-current-buffer (or buffer (current-buffer))
     (let (result)
       (mapatoms