From mboxrd@z Thu Jan 1 00:00:00 1970 From: =?UTF-8?q?Sebastian=20Reu=C3=9Fe?= Subject: [PATCH 4/6] Fix string-collate-lessp shim Date: Sun, 11 Mar 2018 16:43:50 +0100 Message-ID: <20180311154352.16920-4-seb@wirrsal.net> References: <20180311154352.16920-1-seb@wirrsal.net> Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:51490) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ev39h-0000XI-Tz for emacs-orgmode@gnu.org; Sun, 11 Mar 2018 11:45:02 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ev39h-0008N2-2N for emacs-orgmode@gnu.org; Sun, 11 Mar 2018 11:45:01 -0400 Received: from wirrsal.net ([188.68.36.149]:42796 helo=mail.wirrsal.net) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ev39g-0008Mo-Ru for emacs-orgmode@gnu.org; Sun, 11 Mar 2018 11:45:01 -0400 In-Reply-To: <20180311154352.16920-1-seb@wirrsal.net> List-Id: "General discussions about Org-mode." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org Sender: "Emacs-orgmode" To: emacs-orgmode@gnu.org Cc: =?UTF-8?q?Sebastian=20Reu=C3=9Fe?= * org-compat.el (org-string-collate-lessp): When shimming string-collate-lessp, accept the same arguments as in the unshimmed case. --- lisp/org-compat.el | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/lisp/org-compat.el b/lisp/org-compat.el index 975752224..a22b5f1a6 100644 --- a/lisp/org-compat.el +++ b/lisp/org-compat.el @@ -88,10 +88,16 @@ (defvar org-table1-hline-regexp) (= lastc ?\\)))))) ;; `string-collate-lessp' is new in Emacs 25. -(defalias 'org-string-collate-lessp - (if (fboundp 'string-collate-lessp) - 'string-collate-lessp - 'string-lessp)) +(if (fboundp 'string-collate-lessp) + (defalias 'org-string-collate-lessp + 'string-collate-lessp) + (defun org-string-collate-lessp (s1 s2 &optional locale ignore-case) + "Return non-nil if STRING1 is less than STRING2 in lexicographic order. + +Case is significant. + +LOCALE and IGNORE-CASE are ignored." + (string< s1 s2))) ;;; Obsolete aliases (remove them after the next major release). -- 2.16.2