gnus-util.el (gnus-float-time): Use 2-arg defalias, since XEmacs 21.4 doesn't support...

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 03dadc6..250d2e8 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,8 +1,3 @@
-2014-10-29  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-       * gnus-util.el (gnus-float-time):
-       Don't pass the third argument docstring to `defalias' for XEmacs.
-

 2014-10-29  Paul Eggert  <eggert@cs.ucla.edu>
 
        Simplify use of current-time and friends.
 2014-10-29  Paul Eggert  <eggert@cs.ucla.edu>
 
        Simplify use of current-time and friends.

diff --git a/lisp/gnus-util.el b/lisp/gnus-util.el
index fce82db..526aa77 100644 (file)
--- a/lisp/gnus-util.el
+++ b/lisp/gnus-util.el
@@ -313,13 +313,10 @@ Symbols are also allowed; their print names are used instead."
 
 ;; Every version of Emacs Gnus supports has built-in float-time.
 ;; The featurep test silences an irritating compiler warning.
 
 ;; Every version of Emacs Gnus supports has built-in float-time.
 ;; The featurep test silences an irritating compiler warning.

-(if (featurep 'emacs)
-    (defalias 'gnus-float-time 'float-time
-      "Convert time value TIME to a floating point number.
-TIME defaults to the current time.")
-  ;; `defalias' takes only two arguments in XEmacs.
-  (defalias 'gnus-float-time
-    (if (fboundp 'float-time) 'float-time 'time-to-seconds)))
+(defalias 'gnus-float-time
+  (if (or (featurep 'emacs)
+         (fboundp 'float-time))
+      'float-time 'time-to-seconds))

 
 ;;; Keymap macros.
 
 
 ;;; Keymap macros.