Merge branch 'master' of git.savannah.gnu.org:/srv/git/emacs

[gnu-emacs] / lisp / org / org-compat.el

diff --git a/lisp/org/org-compat.el b/lisp/org/org-compat.el
index 9a79a4bc2b1634f70507b9b98fe5160dfeaa348d..2e35c0982ea5d66a0c3b15d68052c759438743c1 100644 (file)
--- a/lisp/org/org-compat.el
+++ b/lisp/org/org-compat.el
@@ -34,8 +34,6 @@
 
 (require 'org-macs)
 
-(declare-function w32-focus-frame "term/w32-win" (frame))
-
 ;; The following constant is for backward compatibility.  We do not use
 ;; it in org-mode, because the Byte compiler evaluates (featurep 'xemacs)
 ;; at compilation time and can therefore optimize code better.
@@ -411,7 +409,7 @@ Pass BUFFER to the XEmacs version of `move-to-column'."
         (when focus-follows-mouse
           (set-mouse-position frame (1- (frame-width frame)) 0)))))
 
-(define-obsolete-function-alias 'org-float-time 'float-time "26.1")
+(define-obsolete-function-alias 'org-float-time 'float-time "25.2")
 
 ;; `user-error' is only available from 24.2.50 on
 (unless (fboundp 'user-error)