aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggert2014-10-28 20:21:06 -0700
committerPaul Eggert2014-10-28 20:21:06 -0700
commit78d45b66d41859ab9bdd571fea18fc06a7670911 (patch)
treee3b8b7605e6658a74e8a20d69384a89ae91d1e56
parent123ddec7f807f4bd7400bbbe08219afb02269c00 (diff)
downloademacs-78d45b66d41859ab9bdd571fea18fc06a7670911.tar.gz
emacs-78d45b66d41859ab9bdd571fea18fc06a7670911.zip
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.
-rw-r--r--lisp/erc/erc.el9
-rw-r--r--lisp/gnus/gnus-util.el4
-rw-r--r--lisp/org/org-compat.el4
3 files changed, 4 insertions, 13 deletions
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."
5957 (truncate (mod n 65536))))) 5957 (truncate (mod n 65536)))))
5958 5958
5959(defalias 'erc-emacs-time-to-erc-time 5959(defalias 'erc-emacs-time-to-erc-time
5960 (if (featurep 'xemacs) 'time-to-seconds 'float-time) 5960 (if (featurep 'xemacs) 'time-to-seconds 'float-time))
5961 "Convert time value TIME to a floating point number.
5962TIME defaults to the current time.")
5963 5961
5964(defalias 'erc-current-time 'erc-emacs-time-to-erc-time 5962(defalias 'erc-current-time 'erc-emacs-time-to-erc-time)
5965 "Return the `current-time' as a number of seconds since the epoch.
5966
5967See also `erc-emacs-time-to-erc-time'.")
5968 5963
5969(defun erc-time-diff (t1 t2) 5964(defun erc-time-diff (t1 t2)
5970 "Return the time difference in seconds between T1 and T2." 5965 "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."
316(defalias 'gnus-float-time 316(defalias 'gnus-float-time
317 (if (or (featurep 'emacs) 317 (if (or (featurep 'emacs)
318 (fboundp 'float-time)) 318 (fboundp 'float-time))
319 'float-time 'time-to-seconds) 319 'float-time 'time-to-seconds))
320 "Convert time value TIME to a floating point number.
321TIME defaults to the current time.")
322 320
323;;; Keymap macros. 321;;; Keymap macros.
324 322
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'."
412 (set-mouse-position frame (1- (frame-width frame)) 0))))) 412 (set-mouse-position frame (1- (frame-width frame)) 0)))))
413 413
414(defalias 'org-float-time 414(defalias 'org-float-time
415 (if (featurep 'xemacs) 'time-to-seconds 'float-time) 415 (if (featurep 'xemacs) 'time-to-seconds 'float-time))
416 "Convert time value TIME to a floating point number.
417TIME defaults to the current time.")
418 416
419;; `user-error' is only available from 24.2.50 on 417;; `user-error' is only available from 24.2.50 on
420(unless (fboundp 'user-error) 418(unless (fboundp 'user-error)