[Emacs-diffs] emacs/lisp ChangeLog calendar/time-date.el net/...

[Katsumi Yamaoka]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Katsumi Yamaoka <yamaoka>       09/09/09 09:29:32

Modified files:
        lisp           : ChangeLog 
        lisp/calendar  : time-date.el 
        lisp/net       : imap.el 

Log message:
        * 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  <address@hidden>
        
        * net/imap.el (imap-message-map): Docstring fix.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.16114&r2=1.16115
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/calendar/time-date.el?cvsroot=emacs&r1=1.31&r2=1.32
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/net/imap.el?cvsroot=emacs&r1=1.19&r2=1.20

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.16114
retrieving revision 1.16115
diff -u -b -r1.16114 -r1.16115
--- ChangeLog   9 Sep 2009 02:36:38 -0000       1.16114
+++ ChangeLog   9 Sep 2009 09:29:29 -0000       1.16115
@@ -1,3 +1,18 @@
+2009-09-09  Katsumi Yamaoka  <address@hidden>
+
+       * 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  <address@hidden>
+
+       * net/imap.el (imap-message-map): Docstring fix.
+
 2009-09-09  Glenn Morris  <address@hidden>
 
        * ffap.el (ffap-file-at-point): Handle absolute (non-remote) files with

Index: calendar/time-date.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/calendar/time-date.el,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -b -r1.31 -r1.32
--- calendar/time-date.el       2 Sep 2009 03:22:30 -0000       1.31
+++ calendar/time-date.el       9 Sep 2009 09:29:31 -0000       1.32
@@ -114,17 +114,27 @@
 ;; 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)))))
+          (/ 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 @@
        (- (/ (1- year) 100))           ;       - century years
        (/ (1- year) 400))))            ;       + Gregorian leap years
 
-(defun time-to-number-of-days (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)

Index: net/imap.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/net/imap.el,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- net/imap.el 30 Aug 2009 14:23:24 -0000      1.19
+++ net/imap.el 9 Sep 2009 09:29:32 -0000       1.20
@@ -1689,7 +1689,7 @@
         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