mirror of
https://git.savannah.gnu.org/git/emacs.git
synced 2024-11-24 07:20:37 +00:00
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.
This commit is contained in:
parent
123ddec7f8
commit
78d45b66d4
@ -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."
|
||||
|
@ -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.
|
||||
|
||||
|
@ -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)
|
||||
|
Loading…
Reference in New Issue
Block a user