From: Paul Eggert <eggert@cs.ucla.edu>
Date: Wed, 29 Oct 2014 03:21:06 +0000 (-0700)
Subject: Port current-time change to XEmacs 21.4.
X-Git-Tag: emacs-25.0.90~2635^2~627
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=78d45b66d41859ab9bdd571fea18fc06a7670911;p=emacs.git

Port current-time change to XEmacs 21.4.

See the buildbot log at:
http://www.randomsample.de:4456/builders/xemacs21.4-linux/builds/1285
* lisp/erc/erc.el (erc-emacs-time-to-erc-time)
(erc-emacs-time-to-erc-time):
* lisp/gnus/gnus-util.el (gnus-float-time):
* lisp/org/org-compat.el (org-float-time):
Use 2-arg defalias, since XEmacs 21.4 doesn't support 3-arg.
---

diff --git a/lisp/erc/erc.el b/lisp/erc/erc.el
index 9363d4a8262..3bb68abfc9e 100644
--- a/lisp/erc/erc.el
+++ b/lisp/erc/erc.el
@@ -5957,14 +5957,9 @@ Returns a list of the form (HIGH LOW), compatible with Emacs time format."
           (truncate (mod n 65536)))))
 
 (defalias 'erc-emacs-time-to-erc-time
-  (if (featurep 'xemacs) 'time-to-seconds 'float-time)
-  "Convert time value TIME to a floating point number.
-TIME defaults to the current time.")
+  (if (featurep 'xemacs) 'time-to-seconds 'float-time))
 
-(defalias 'erc-current-time 'erc-emacs-time-to-erc-time
-  "Return the `current-time' as a number of seconds since the epoch.
-
-See also `erc-emacs-time-to-erc-time'.")
+(defalias 'erc-current-time 'erc-emacs-time-to-erc-time)
 
 (defun erc-time-diff (t1 t2)
   "Return the time difference in seconds between T1 and T2."
diff --git a/lisp/gnus/gnus-util.el b/lisp/gnus/gnus-util.el
index 15f3aede889..526aa7785ca 100644
--- a/lisp/gnus/gnus-util.el
+++ b/lisp/gnus/gnus-util.el
@@ -316,9 +316,7 @@ Symbols are also allowed; their print names are used instead."
 (defalias 'gnus-float-time
   (if (or (featurep 'emacs)
 	  (fboundp 'float-time))
-      'float-time 'time-to-seconds)
-  "Convert time value TIME to a floating point number.
-TIME defaults to the current time.")
+      'float-time 'time-to-seconds))
 
 ;;; Keymap macros.
 
diff --git a/lisp/org/org-compat.el b/lisp/org/org-compat.el
index 122658970f5..447505ceafb 100644
--- a/lisp/org/org-compat.el
+++ b/lisp/org/org-compat.el
@@ -412,9 +412,7 @@ Pass BUFFER to the XEmacs version of `move-to-column'."
 	   (set-mouse-position frame (1- (frame-width frame)) 0)))))
 
 (defalias 'org-float-time
-  (if (featurep 'xemacs) 'time-to-seconds 'float-time)
-  "Convert time value TIME to a floating point number.
-TIME defaults to the current time.")
+  (if (featurep 'xemacs) 'time-to-seconds 'float-time))
 
 ;; `user-error' is only available from 24.2.50 on
 (unless (fboundp 'user-error)