From 61c8903c87bb7cd288fa996e338ccf8f8050a328 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Tue, 13 Feb 2018 14:17:00 +0100
Subject: [PATCH] Fix failing tests

* lisp/org-compat.el (org-string-collate-lessp): Reinstate function,
  inadvertently removed in last merge with maint branch.
---
 lisp/org-compat.el | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/lisp/org-compat.el b/lisp/org-compat.el
index af2ef02fa..975752224 100644
--- a/lisp/org-compat.el
+++ b/lisp/org-compat.el
@@ -87,6 +87,12 @@
 	  (and (memq system-type '(windows-nt ms-dos))
 	       (= lastc ?\\))))))
 
+;; `string-collate-lessp' is new in Emacs 25.
+(defalias 'org-string-collate-lessp
+  (if (fboundp 'string-collate-lessp)
+      'string-collate-lessp
+    'string-lessp))
+
 
 ;;; Obsolete aliases (remove them after the next major release).