diff options
| author | Paul Eggert | 2014-10-28 20:21:06 -0700 |
|---|---|---|
| committer | Paul Eggert | 2014-10-28 20:21:06 -0700 |
| commit | 78d45b66d41859ab9bdd571fea18fc06a7670911 (patch) | |
| tree | e3b8b7605e6658a74e8a20d69384a89ae91d1e56 /lisp/org | |
| parent | 123ddec7f807f4bd7400bbbe08219afb02269c00 (diff) | |
| download | emacs-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.
Diffstat (limited to 'lisp/org')
| -rw-r--r-- | lisp/org/org-compat.el | 4 |
1 files changed, 1 insertions, 3 deletions
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. | ||
| 417 | TIME 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) |