From 11bd8aa24b347f75e674528dd1a94b0a4037105e Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Fri, 20 Oct 2017 13:07:30 -0400 Subject: [PATCH] Fix flymake's loading of subr-x * lisp/progmodes/flymake.el, test/lisp/progmodes/flymake-tests.el: No need to load subr-x at run-time. --- lisp/progmodes/flymake.el | 3 ++- test/lisp/progmodes/flymake-tests.el | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/lisp/progmodes/flymake.el b/lisp/progmodes/flymake.el index 9c546fd9667..3c588f02fa6 100644 --- a/lisp/progmodes/flymake.el +++ b/lisp/progmodes/flymake.el @@ -48,7 +48,8 @@ (require 'thingatpt) ; end-of-thing (require 'warnings) ; warning-numeric-level, display-warning (require 'compile) ; for some faces -(require 'subr-x) ; when-let*, if-let*, hash-table-keys, hash-table-values +;; when-let*, if-let*, hash-table-keys, hash-table-values: +(eval-when-compile (require 'subr-x)) (defgroup flymake nil "Universal on-the-fly syntax checker." diff --git a/test/lisp/progmodes/flymake-tests.el b/test/lisp/progmodes/flymake-tests.el index eddd964ad14..cfa810053ca 100644 --- a/test/lisp/progmodes/flymake-tests.el +++ b/test/lisp/progmodes/flymake-tests.el @@ -24,7 +24,7 @@ ;;; Code: (require 'ert) (require 'flymake) -(require 'subr-x) ; string-trim +(eval-when-compile (require 'subr-x)) ; string-trim (defvar flymake-tests-data-directory (expand-file-name "lisp/progmodes/flymake-resources" -- 2.39.2