From 04d9d4b3db84e0025e21e9248bc2d218cd3c0e9b Mon Sep 17 00:00:00 2001 From: Kyle Meyer Date: Sat, 8 Oct 2022 01:40:07 -0400 Subject: [PATCH] compat: Load subr-x for Emacs < 28 compatibility * lisp/org-compat.el: Require subr-x at compile time to define string-trim for older Emacs versions. Before Emacs 28.1, string-trim was defined in subr-x, leading to 'make single' complaining about an undefined string-trim in the recently added org-string-clean-whitespace. Reported-by: Ihor Radchenko Link: https://list.orgmode.org/8735c01aho.fsf@localhost --- lisp/org-compat.el | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lisp/org-compat.el b/lisp/org-compat.el index 53fe56ab9..975b360fb 100644 --- a/lisp/org-compat.el +++ b/lisp/org-compat.el @@ -34,6 +34,8 @@ (require 'seq) (require 'org-macs) +(eval-when-compile (require 'subr-x)) ; Emacs < 28 + ;; We rely on org-compat when generating Org version. Checking Org ;; version here will interfere with Org build process. ;; (org-assert-version)