From 6873c9088b90472107a384ff816a119c44a343b1 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Tue, 28 Oct 2014 20:21:06 -0700 Subject: [PATCH] Backport commit 78d45b6 from Emacs master branch * lisp/org-compat.el (org-float-time): Use 2-arg defalias, since XEmacs 21.4 doesn't support 3-arg. Port current-time change to XEmacs 21.4. 78d45b66d41859ab9bdd571fea18fc06a7670911 Paul Eggert Tue Oct 28 20:21:06 2014 -0700 --- lisp/org-compat.el | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/lisp/org-compat.el b/lisp/org-compat.el index 7a22fcf7a..decf76dbd 100644 --- a/lisp/org-compat.el +++ b/lisp/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)