From f471f5b16c4ebf2f079779e5691e38aae9a6b705 Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Sun, 19 May 2024 17:18:08 -0400 Subject: [PATCH 3/4] testing/org-test.el (): Remove dead code (featurep 'org) is always non-nil here since we have a (require 'org) further up. I suspect other `require`s nearby could be removed or moved to toplevel. --- testing/org-test.el | 29 ++++++++++------------------- 1 file changed, 10 insertions(+), 19 deletions(-) diff --git a/testing/org-test.el b/testing/org-test.el index d9fe33284c..8060e1d210 100644 --- a/testing/org-test.el +++ b/testing/org-test.el @@ -48,25 +48,16 @@ (file-name-directory (or load-file-name buffer-file-name)))) (org-lisp-dir (expand-file-name - (concat org-test-dir "../lisp")))) - - (unless (featurep 'org) - (setq load-path (cons org-lisp-dir load-path)) - (require 'org) - (require 'org-id) - (require 'ox) - (org-babel-do-load-languages - 'org-babel-load-languages '((shell . t) (org . t)))) - - (let ((load-path (cons org-test-dir - (cons (expand-file-name "jump" org-test-dir) - load-path)))) - (require 'cl-lib) - (require 'ert) - (require 'ert-x) - (when (file-exists-p (expand-file-name "jump/jump.el" org-test-dir)) - (require 'jump) - (require 'which-func))))) + (concat org-test-dir "../lisp"))) + (load-path (cons org-test-dir + (cons (expand-file-name "jump" org-test-dir) + load-path)))) + (require 'cl-lib) + (require 'ert) + (require 'ert-x) + (when (file-exists-p (expand-file-name "jump/jump.el" org-test-dir)) + (require 'jump) + (require 'which-func)))) (defconst org-test-default-test-file-name "tests.el" "For each defun a separate file with tests may be defined. -- 2.39.2