[Emacs-diffs] trunk r118229: Port current-time change to XEmacs 21.4.

[Paul Eggert]

------------------------------------------------------------
revno: 118229
revision-id: address@hidden
parent: address@hidden
committer: Paul Eggert <address@hidden>
branch nick: trunk
timestamp: Tue 2014-10-28 20:21:06 -0700
message:
  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.
modified:
  lisp/erc/erc.el                erc.el-20091113204419-o5vbwnq5f7feedwu-4346
  lisp/gnus/gnus-util.el         
gnusutil.el-20091113204419-o5vbwnq5f7feedwu-1140
  lisp/org/org-compat.el         
orgcompat.el-20091113204419-o5vbwnq5f7feedwu-8646

=== modified file 'lisp/erc/erc.el'
--- a/lisp/erc/erc.el   2014-10-29 01:42:51 +0000
+++ b/lisp/erc/erc.el   2014-10-29 03:21:06 +0000
@@ -5957,14 +5957,9 @@
           (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.")
-
-(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'.")
+  (if (featurep 'xemacs) 'time-to-seconds 'float-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."

=== modified file 'lisp/gnus/gnus-util.el'
--- a/lisp/gnus/gnus-util.el    2014-10-29 01:42:51 +0000
+++ b/lisp/gnus/gnus-util.el    2014-10-29 03:21:06 +0000
@@ -316,9 +316,7 @@
 (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.
 

=== modified file 'lisp/org/org-compat.el'
--- a/lisp/org/org-compat.el    2014-10-29 01:42:51 +0000
+++ b/lisp/org/org-compat.el    2014-10-29 03:21:06 +0000
@@ -412,9 +412,7 @@
           (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)