From 02de57b597b75f85dcf365b9b1217219a11e7e66 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Fri, 29 Jul 2016 14:40:27 +0200
Subject: [PATCH] org-compat: Fix regression introduced in 6daad6

Reported-by: Humberto Nanni <humberto.nanni@gmail.com>
<http://permalink.gmane.org/gmane.emacs.orgmode/108550>
---
 lisp/org-compat.el | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/lisp/org-compat.el b/lisp/org-compat.el
index 4ea2655d3..d5b45155e 100644
--- a/lisp/org-compat.el
+++ b/lisp/org-compat.el
@@ -47,11 +47,8 @@
   (defalias 'outline-show-entry 'show-entry)
   (defalias 'outline-show-subtree 'show-subtree)
   (defalias 'xref-find-definitions 'find-tag)
-  (defalias 'format-message 'format))
-
-(eval-when-compile
-  (when (< emacs-major-version 25)
-    (defalias 'gui-get-selection 'x-get-selection)))
+  (defalias 'format-message 'format)
+  (defalias 'gui-get-selection 'x-get-selection))
 
 
 ;;; Obsolete aliases (remove them once the next major release is released).