branch: elpa/casual
commit 761de09b0ebce5c41a323200f6f6f491c0d7797c
Merge: f25b7ac4a6 159dc925f7
Author: Charles Choi <[email protected]>
Commit: GitHub <[email protected]>
Merge pull request #473 from
kickingvegas/472-fix-test-regression-for-transient-v0135-dependency-on-llama
Update regression to include llama
---
lisp/Makefile--defines.make | 10 +++++++++-
lisp/Makefile-agenda.make | 6 ------
lisp/Makefile-bibtex.make | 8 +-------
lisp/Makefile-bookmarks.make | 8 +-------
lisp/Makefile-calc.make | 16 +---------------
lisp/Makefile-calendar.make | 14 +-------------
lisp/Makefile-compile.make | 8 +-------
lisp/Makefile-css.make | 6 ------
lisp/Makefile-csv.make | 11 +++--------
lisp/Makefile-dired.make | 8 +-------
lisp/Makefile-ediff.make | 13 +------------
lisp/Makefile-editkit.make | 13 +++----------
lisp/Makefile-elisp.make | 8 +-------
lisp/Makefile-eshell.make | 13 +------------
lisp/Makefile-eww.make | 6 ------
lisp/Makefile-help.make | 8 +-------
lisp/Makefile-html.make | 8 +-------
lisp/Makefile-ibuffer.make | 8 +-------
lisp/Makefile-image.make | 8 +-------
lisp/Makefile-info.make | 8 +-------
lisp/Makefile-isearch.make | 6 ------
lisp/Makefile-ispell.make | 6 ------
lisp/Makefile-lib.make | 6 ------
lisp/Makefile-make-mode.make | 8 +-------
lisp/Makefile-man.make | 8 +-------
lisp/Makefile-org.make | 9 ++-------
lisp/Makefile-re-builder.make | 8 +-------
lisp/Makefile-timezone.make | 8 +-------
28 files changed, 35 insertions(+), 212 deletions(-)
diff --git a/lisp/Makefile--defines.make b/lisp/Makefile--defines.make
index 2e5b341255..4aa93e8aab 100644
--- a/lisp/Makefile--defines.make
+++ b/lisp/Makefile--defines.make
@@ -1,5 +1,5 @@
##
-# Copyright (C) 2024-2025 Charles Y. Choi
+# Copyright (C) 2024-2026 Charles Y. Choi
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -35,3 +35,11 @@ CASUAL_BASE_DIR=$(abspath $(shell pwd)/..)
CASUAL_LISP_DIR=$(CASUAL_BASE_DIR)/lisp
CASUAL_TEST_INCLUDES=$(CASUAL_BASE_DIR)/tests/casual-lib-test-utils.el
EMACS_ELPA_DIR=$(HOME)/.config/emacs/elpa
+
+PACKAGE_PATHS= \
+-L $(EMACS_ELPA_DIR)/compat-current \
+-L $(EMACS_ELPA_DIR)/seq-current \
+-L $(EMACS_ELPA_DIR)/llama-current \
+-L $(EMACS_ELPA_DIR)/transient-current \
+-L $(EMACS_ELPA_DIR)/cond-let-current \
+-L $(CASUAL_LISP_DIR)
diff --git a/lisp/Makefile-agenda.make b/lisp/Makefile-agenda.make
index cce8b237d6..60d3e542b6 100644
--- a/lisp/Makefile-agenda.make
+++ b/lisp/Makefile-agenda.make
@@ -21,11 +21,5 @@ ELISP_INCLUDES=casual-agenda-utils.el \
casual-agenda-settings.el
ELISP_PACKAGES=
ELISP_TEST_INCLUDES=casual-agenda-test-utils.el
-PACKAGE_PATHS= \
--L $(EMACS_ELPA_DIR)/compat-current \
--L $(EMACS_ELPA_DIR)/seq-current \
--L $(EMACS_ELPA_DIR)/transient-current \
--L $(EMACS_ELPA_DIR)/cond-let-current \
--L $(CASUAL_LISP_DIR)
include Makefile--rules.make
diff --git a/lisp/Makefile-bibtex.make b/lisp/Makefile-bibtex.make
index 96e6a6c691..4868c87c12 100644
--- a/lisp/Makefile-bibtex.make
+++ b/lisp/Makefile-bibtex.make
@@ -1,5 +1,5 @@
##
-# Copyright (C) 2025 Charles Y. Choi
+# Copyright (C) 2025-2026 Charles Y. Choi
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -21,11 +21,5 @@ ELISP_INCLUDES=casual-bibtex-utils.el \
casual-bibtex-settings.el
ELISP_PACKAGES=
ELISP_TEST_INCLUDES=casual-bibtex-test-utils.el
-PACKAGE_PATHS= \
--L $(EMACS_ELPA_DIR)/compat-current \
--L $(EMACS_ELPA_DIR)/seq-current \
--L $(EMACS_ELPA_DIR)/transient-current \
--L $(EMACS_ELPA_DIR)/cond-let-current \
--L $(CASUAL_LISP_DIR)
include Makefile--rules.make
diff --git a/lisp/Makefile-bookmarks.make b/lisp/Makefile-bookmarks.make
index bc0cd0cfbe..653c186a17 100644
--- a/lisp/Makefile-bookmarks.make
+++ b/lisp/Makefile-bookmarks.make
@@ -1,5 +1,5 @@
##
-# Copyright (C) 2024-2025 Charles Y. Choi
+# Copyright (C) 2024-2026 Charles Y. Choi
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -21,11 +21,5 @@ ELISP_INCLUDES=casual-bookmarks-utils.el \
casual-bookmarks-settings.el
ELISP_PACKAGES=
ELISP_TEST_INCLUDES=casual-bookmarks-test-utils.el
-PACKAGE_PATHS= \
--L $(EMACS_ELPA_DIR)/compat-current \
--L $(EMACS_ELPA_DIR)/seq-current \
--L $(EMACS_ELPA_DIR)/transient-current \
--L $(EMACS_ELPA_DIR)/cond-let-current \
--L $(CASUAL_LISP_DIR)
include Makefile--rules.make
diff --git a/lisp/Makefile-calc.make b/lisp/Makefile-calc.make
index aed9a1318e..71eac30d90 100644
--- a/lisp/Makefile-calc.make
+++ b/lisp/Makefile-calc.make
@@ -1,5 +1,5 @@
##
-# Copyright (C) 2024-2025 Charles Y. Choi
+# Copyright (C) 2024-2026 Charles Y. Choi
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -48,18 +48,4 @@ casual-calc-symbolic.el
ELISP_TEST_INCLUDES=casual-calc-test-utils.el
-PACKAGE_PATHS= \
--L $(EMACS_ELPA_DIR)/compat-current \
--L $(EMACS_ELPA_DIR)/seq-current \
--L $(EMACS_ELPA_DIR)/transpose-frame-current \
--L $(EMACS_ELPA_DIR)/transient-current \
--L $(EMACS_ELPA_DIR)/cond-let-current \
--L $(EMACS_ELPA_DIR)/magit-current \
--L $(EMACS_ELPA_DIR)/magit-section-current \
--L $(EMACS_ELPA_DIR)/dash-current \
--L $(EMACS_ELPA_DIR)/with-editor-current \
--L $(EMACS_ELPA_DIR)/symbol-overlay-current \
--L $(CASUAL_LISP_DIR)
-
-
include Makefile--rules.make
diff --git a/lisp/Makefile-calendar.make b/lisp/Makefile-calendar.make
index 0e73bbc8e9..0b02b37c32 100644
--- a/lisp/Makefile-calendar.make
+++ b/lisp/Makefile-calendar.make
@@ -1,5 +1,5 @@
##
-# Copyright (C) 2024-2025 Charles Y. Choi
+# Copyright (C) 2024-2026 Charles Y. Choi
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -22,18 +22,6 @@ casual-calendar-utils.el \
casual-calendar-settings.el
ELISP_PACKAGES=
ELISP_TEST_INCLUDES=casual-calendar-test-utils.el
-PACKAGE_PATHS= \
--L $(EMACS_ELPA_DIR)/compat-current \
--L $(EMACS_ELPA_DIR)/seq-current \
--L $(EMACS_ELPA_DIR)/transpose-frame-current \
--L $(EMACS_ELPA_DIR)/transient-current \
--L $(EMACS_ELPA_DIR)/cond-let-current \
--L $(EMACS_ELPA_DIR)/magit-current \
--L $(EMACS_ELPA_DIR)/magit-section-current \
--L $(EMACS_ELPA_DIR)/dash-current \
--L $(EMACS_ELPA_DIR)/with-editor-current \
--L $(EMACS_ELPA_DIR)/symbol-overlay-current \
--L $(CASUAL_LISP_DIR)
include Makefile--rules.make
diff --git a/lisp/Makefile-compile.make b/lisp/Makefile-compile.make
index b0da4a8112..689f2d14be 100644
--- a/lisp/Makefile-compile.make
+++ b/lisp/Makefile-compile.make
@@ -1,5 +1,5 @@
##
-# Copyright (C) 2025 Charles Y. Choi
+# Copyright (C) 2025-2026 Charles Y. Choi
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -21,11 +21,5 @@ ELISP_INCLUDES=casual-compile-utils.el \
casual-compile-settings.el
ELISP_PACKAGES=
ELISP_TEST_INCLUDES=casual-compile-test-utils.el
-PACKAGE_PATHS= \
--L $(EMACS_ELPA_DIR)/compat-current \
--L $(EMACS_ELPA_DIR)/seq-current \
--L $(EMACS_ELPA_DIR)/transient-current \
--L $(EMACS_ELPA_DIR)/cond-let-current \
--L $(CASUAL_LISP_DIR)
include Makefile--rules.make
diff --git a/lisp/Makefile-css.make b/lisp/Makefile-css.make
index 65fb4f9c3f..8d72529511 100644
--- a/lisp/Makefile-css.make
+++ b/lisp/Makefile-css.make
@@ -21,11 +21,5 @@ ELISP_INCLUDES=casual-css-utils.el \
casual-css-settings.el
ELISP_PACKAGES=
ELISP_TEST_INCLUDES=casual-css-test-utils.el
-PACKAGE_PATHS= \
--L $(EMACS_ELPA_DIR)/compat-current \
--L $(EMACS_ELPA_DIR)/seq-current \
--L $(EMACS_ELPA_DIR)/transient-current \
--L $(EMACS_ELPA_DIR)/cond-let-current \
--L $(CASUAL_LISP_DIR)
include Makefile--rules.make
diff --git a/lisp/Makefile-csv.make b/lisp/Makefile-csv.make
index ee3d08d72e..2e372a30cd 100644
--- a/lisp/Makefile-csv.make
+++ b/lisp/Makefile-csv.make
@@ -1,5 +1,5 @@
##
-# Copyright (C) 2025 Charles Y. Choi
+# Copyright (C) 2025-2026 Charles Y. Choi
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -21,12 +21,7 @@ ELISP_INCLUDES=casual-csv-utils.el \
casual-csv-settings.el
ELISP_PACKAGES=
ELISP_TEST_INCLUDES=casual-csv-test-utils.el
-PACKAGE_PATHS= \
--L $(EMACS_ELPA_DIR)/compat-current \
--L $(EMACS_ELPA_DIR)/seq-current \
--L $(EMACS_ELPA_DIR)/transient-current \
--L $(EMACS_ELPA_DIR)/cond-let-current \
--L $(EMACS_ELPA_DIR)/csv-mode-current \
--L $(CASUAL_LISP_DIR)
+PACKAGE_PATHS:=$(PACKAGE_PATHS) \
+-L $(EMACS_ELPA_DIR)/csv-mode-current
include Makefile--rules.make
diff --git a/lisp/Makefile-dired.make b/lisp/Makefile-dired.make
index c910d558b5..29bc36af2d 100644
--- a/lisp/Makefile-dired.make
+++ b/lisp/Makefile-dired.make
@@ -1,5 +1,5 @@
##
-# Copyright (C) 2024-2025 Charles Y. Choi
+# Copyright (C) 2024-2026 Charles Y. Choi
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -19,12 +19,6 @@ PACKAGE_NAME=casual-dired
ELISP_INCLUDES=casual-dired-variables.el casual-dired-utils.el
ELISP_PACKAGES=casual-dired-settings.el casual-dired-sort-by.el
ELISP_TEST_INCLUDES=casual-dired-test-utils.el
-PACKAGE_PATHS= \
--L $(EMACS_ELPA_DIR)/compat-current \
--L $(EMACS_ELPA_DIR)/seq-current \
--L $(EMACS_ELPA_DIR)/transient-current \
--L $(EMACS_ELPA_DIR)/cond-let-current \
--L $(CASUAL_LISP_DIR)
include Makefile--rules.make
diff --git a/lisp/Makefile-ediff.make b/lisp/Makefile-ediff.make
index 431171fa4b..cc7c3d7841 100644
--- a/lisp/Makefile-ediff.make
+++ b/lisp/Makefile-ediff.make
@@ -1,5 +1,5 @@
##
-# Copyright (C) 2025 Charles Y. Choi
+# Copyright (C) 2025-2026 Charles Y. Choi
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -21,16 +21,5 @@ ELISP_INCLUDES=casual-ediff-utils.el \
casual-ediff-settings.el
ELISP_PACKAGES=
ELISP_TEST_INCLUDES=casual-ediff-test-utils.el
-PACKAGE_PATHS= \
--L $(EMACS_ELPA_DIR)/compat-current \
--L $(EMACS_ELPA_DIR)/seq-current \
--L $(EMACS_ELPA_DIR)/transient-current \
--L $(EMACS_ELPA_DIR)/cond-let-current \
--L $(EMACS_ELPA_DIR)/magit-current \
--L $(EMACS_ELPA_DIR)/magit-section-current \
--L $(EMACS_ELPA_DIR)/dash-current \
--L $(EMACS_ELPA_DIR)/with-editor-current \
--L $(EMACS_ELPA_DIR)/llama-current \
--L $(CASUAL_LISP_DIR)
include Makefile--rules.make
diff --git a/lisp/Makefile-editkit.make b/lisp/Makefile-editkit.make
index 27e351cdc4..55ae363619 100644
--- a/lisp/Makefile-editkit.make
+++ b/lisp/Makefile-editkit.make
@@ -1,5 +1,5 @@
##
-# Copyright (C) 2024-2025 Charles Y. Choi
+# Copyright (C) 2024-2026 Charles Y. Choi
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -21,17 +21,10 @@ casual-editkit-settings.el \
casual-editkit-utils.el
ELISP_PACKAGES=
ELISP_TEST_INCLUDES=casual-editkit-test-utils.el
-PACKAGE_PATHS= \
--L $(EMACS_ELPA_DIR)/compat-current \
--L $(EMACS_ELPA_DIR)/seq-current \
--L $(EMACS_ELPA_DIR)/transpose-frame-current \
--L $(EMACS_ELPA_DIR)/transient-current \
--L $(EMACS_ELPA_DIR)/cond-let-current \
+PACKAGE_PATHS:=$(PACKAGE_PATHS) \
-L $(EMACS_ELPA_DIR)/magit-current \
-L $(EMACS_ELPA_DIR)/magit-section-current \
--L $(EMACS_ELPA_DIR)/dash-current \
-L $(EMACS_ELPA_DIR)/with-editor-current \
--L $(EMACS_ELPA_DIR)/symbol-overlay-current \
--L $(CASUAL_LISP_DIR)
+-L $(EMACS_ELPA_DIR)/symbol-overlay-current
include Makefile--rules.make
diff --git a/lisp/Makefile-elisp.make b/lisp/Makefile-elisp.make
index a20c276404..744b241823 100644
--- a/lisp/Makefile-elisp.make
+++ b/lisp/Makefile-elisp.make
@@ -1,5 +1,5 @@
##
-# Copyright (C) 2025 Charles Y. Choi
+# Copyright (C) 2025-2026 Charles Y. Choi
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -21,11 +21,5 @@ ELISP_INCLUDES=casual-elisp-utils.el \
casual-elisp-settings.el
ELISP_PACKAGES=
ELISP_TEST_INCLUDES=casual-elisp-test-utils.el
-PACKAGE_PATHS= \
--L $(EMACS_ELPA_DIR)/compat-current \
--L $(EMACS_ELPA_DIR)/seq-current \
--L $(EMACS_ELPA_DIR)/transient-current \
--L $(EMACS_ELPA_DIR)/cond-let-current \
--L $(CASUAL_LISP_DIR)
include Makefile--rules.make
diff --git a/lisp/Makefile-eshell.make b/lisp/Makefile-eshell.make
index f110ceaa77..ead0e22eb9 100644
--- a/lisp/Makefile-eshell.make
+++ b/lisp/Makefile-eshell.make
@@ -1,5 +1,5 @@
##
-# Copyright (C) 2025 Charles Y. Choi
+# Copyright (C) 2025-2026 Charles Y. Choi
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -21,16 +21,5 @@ ELISP_INCLUDES=casual-eshell-utils.el \
casual-eshell-settings.el
ELISP_PACKAGES=
ELISP_TEST_INCLUDES=casual-eshell-test-utils.el
-PACKAGE_PATHS= \
--L $(EMACS_ELPA_DIR)/compat-current \
--L $(EMACS_ELPA_DIR)/seq-current \
--L $(EMACS_ELPA_DIR)/transient-current \
--L $(EMACS_ELPA_DIR)/cond-let-current \
--L $(EMACS_ELPA_DIR)/magit-current \
--L $(EMACS_ELPA_DIR)/magit-section-current \
--L $(EMACS_ELPA_DIR)/dash-current \
--L $(EMACS_ELPA_DIR)/with-editor-current \
--L $(EMACS_ELPA_DIR)/llama-current \
--L $(CASUAL_LISP_DIR)
include Makefile--rules.make
diff --git a/lisp/Makefile-eww.make b/lisp/Makefile-eww.make
index 63080deb25..e97462fb0b 100644
--- a/lisp/Makefile-eww.make
+++ b/lisp/Makefile-eww.make
@@ -21,11 +21,5 @@ ELISP_INCLUDES=casual-eww-utils.el \
casual-eww-settings.el
ELISP_PACKAGES=
ELISP_TEST_INCLUDES=casual-eww-test-utils.el
-PACKAGE_PATHS= \
--L $(EMACS_ELPA_DIR)/compat-current \
--L $(EMACS_ELPA_DIR)/seq-current \
--L $(EMACS_ELPA_DIR)/transient-current \
--L $(EMACS_ELPA_DIR)/cond-let-current \
--L $(CASUAL_LISP_DIR)
include Makefile--rules.make
diff --git a/lisp/Makefile-help.make b/lisp/Makefile-help.make
index d7e9f47819..3ac39a3599 100644
--- a/lisp/Makefile-help.make
+++ b/lisp/Makefile-help.make
@@ -1,5 +1,5 @@
##
-# Copyright (C) 2025 Charles Y. Choi
+# Copyright (C) 2025-2026 Charles Y. Choi
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -21,11 +21,5 @@ ELISP_INCLUDES=casual-help-utils.el \
casual-help-settings.el
ELISP_PACKAGES=
ELISP_TEST_INCLUDES=casual-help-test-utils.el
-PACKAGE_PATHS= \
--L $(EMACS_ELPA_DIR)/compat-current \
--L $(EMACS_ELPA_DIR)/seq-current \
--L $(EMACS_ELPA_DIR)/transient-current \
--L $(EMACS_ELPA_DIR)/cond-let-current \
--L $(CASUAL_LISP_DIR)
include Makefile--rules.make
diff --git a/lisp/Makefile-html.make b/lisp/Makefile-html.make
index c0d8a64f52..ca9cc0d918 100644
--- a/lisp/Makefile-html.make
+++ b/lisp/Makefile-html.make
@@ -1,5 +1,5 @@
##
-# Copyright (C) 2025 Charles Y. Choi
+# Copyright (C) 2025-2026 Charles Y. Choi
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -21,11 +21,5 @@ ELISP_INCLUDES=casual-html-utils.el \
casual-html-settings.el
ELISP_PACKAGES=
ELISP_TEST_INCLUDES=casual-html-test-utils.el
-PACKAGE_PATHS= \
--L $(EMACS_ELPA_DIR)/compat-current \
--L $(EMACS_ELPA_DIR)/seq-current \
--L $(EMACS_ELPA_DIR)/transient-current \
--L $(EMACS_ELPA_DIR)/cond-let-current \
--L $(CASUAL_LISP_DIR)
include Makefile--rules.make
diff --git a/lisp/Makefile-ibuffer.make b/lisp/Makefile-ibuffer.make
index 755de69baa..4843fd237d 100644
--- a/lisp/Makefile-ibuffer.make
+++ b/lisp/Makefile-ibuffer.make
@@ -1,5 +1,5 @@
##
-# Copyright (C) 2024-2025 Charles Y. Choi
+# Copyright (C) 2024-2026 Charles Y. Choi
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -20,11 +20,5 @@ ELISP_INCLUDES=casual-ibuffer-utils.el \
casual-ibuffer-settings.el
ELISP_PACKAGES=casual-ibuffer-filter.el
ELISP_TEST_INCLUDES=casual-ibuffer-test-utils.el
-PACKAGE_PATHS= \
--L $(EMACS_ELPA_DIR)/compat-current \
--L $(EMACS_ELPA_DIR)/seq-current \
--L $(EMACS_ELPA_DIR)/transient-current \
--L $(EMACS_ELPA_DIR)/cond-let-current \
--L $(CASUAL_LISP_DIR)
include Makefile--rules.make
diff --git a/lisp/Makefile-image.make b/lisp/Makefile-image.make
index fccf82de16..69b93facce 100644
--- a/lisp/Makefile-image.make
+++ b/lisp/Makefile-image.make
@@ -1,5 +1,5 @@
##
-# Copyright (C) 2025 Charles Y. Choi
+# Copyright (C) 2025-2026 Charles Y. Choi
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -20,11 +20,5 @@ PACKAGE_NAME=casual-image
ELISP_INCLUDES=casual-image-utils.el casual-image-settings.el
ELISP_PACKAGES=
ELISP_TEST_INCLUDES=casual-image-test-utils.el
-PACKAGE_PATHS= \
--L $(EMACS_ELPA_DIR)/compat-current \
--L $(EMACS_ELPA_DIR)/seq-current \
--L $(EMACS_ELPA_DIR)/transient-current \
--L $(EMACS_ELPA_DIR)/cond-let-current \
--L $(CASUAL_LISP_DIR)
include Makefile--rules.make
diff --git a/lisp/Makefile-info.make b/lisp/Makefile-info.make
index 3e74fee570..bb9bf41c1c 100644
--- a/lisp/Makefile-info.make
+++ b/lisp/Makefile-info.make
@@ -1,5 +1,5 @@
##
-# Copyright (C) 2024-2025 Charles Y. Choi
+# Copyright (C) 2024-2026 Charles Y. Choi
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -20,12 +20,6 @@ PACKAGE_NAME=casual-info
ELISP_INCLUDES=casual-info-variables.el casual-info-utils.el
ELISP_PACKAGES=casual-info-settings.el
ELISP_TEST_INCLUDES=casual-info-test-utils.el
-PACKAGE_PATHS= \
--L $(EMACS_ELPA_DIR)/compat-current \
--L $(EMACS_ELPA_DIR)/seq-current \
--L $(EMACS_ELPA_DIR)/transient-current \
--L $(EMACS_ELPA_DIR)/cond-let-current \
--L $(CASUAL_LISP_DIR)
include Makefile--rules.make
diff --git a/lisp/Makefile-isearch.make b/lisp/Makefile-isearch.make
index 8c1f9f4ddd..fed88101b8 100644
--- a/lisp/Makefile-isearch.make
+++ b/lisp/Makefile-isearch.make
@@ -21,11 +21,5 @@ ELISP_INCLUDES=casual-isearch-utils.el \
casual-isearch-settings.el
ELISP_PACKAGES=
ELISP_TEST_INCLUDES=casual-isearch-test-utils.el
-PACKAGE_PATHS= \
--L $(EMACS_ELPA_DIR)/compat-current \
--L $(EMACS_ELPA_DIR)/seq-current \
--L $(EMACS_ELPA_DIR)/transient-current \
--L $(EMACS_ELPA_DIR)/cond-let-current \
--L $(CASUAL_LISP_DIR)
include Makefile--rules.make
diff --git a/lisp/Makefile-ispell.make b/lisp/Makefile-ispell.make
index 6184a05b1d..8a044137e7 100644
--- a/lisp/Makefile-ispell.make
+++ b/lisp/Makefile-ispell.make
@@ -21,11 +21,5 @@ ELISP_INCLUDES=casual-ispell-utils.el \
casual-ispell-settings.el
ELISP_PACKAGES=
ELISP_TEST_INCLUDES=casual-ispell-test-utils.el
-PACKAGE_PATHS= \
--L $(EMACS_ELPA_DIR)/compat-current \
--L $(EMACS_ELPA_DIR)/seq-current \
--L $(EMACS_ELPA_DIR)/transient-current \
--L $(EMACS_ELPA_DIR)/cond-let-current \
--L $(CASUAL_LISP_DIR)
include Makefile--rules.make
diff --git a/lisp/Makefile-lib.make b/lisp/Makefile-lib.make
index 6b04c54ca7..69e45069d8 100644
--- a/lisp/Makefile-lib.make
+++ b/lisp/Makefile-lib.make
@@ -20,12 +20,6 @@ ELISP_INCLUDES=
ELISP_PACKAGES=
ELISP_TEST_INCLUDES=casual-lib-test-utils.el
PACKAGE_NAME=casual-lib
-PACKAGE_PATHS= \
--L $(EMACS_ELPA_DIR)/compat-current \
--L $(EMACS_ELPA_DIR)/seq-current \
--L $(EMACS_ELPA_DIR)/transient-current \
--L $(EMACS_ELPA_DIR)/cond-let-current \
--L $(CASUAL_LISP_DIR)
.PHONY: tests compile regression
diff --git a/lisp/Makefile-make-mode.make b/lisp/Makefile-make-mode.make
index 3ba66d08eb..0ab700583b 100644
--- a/lisp/Makefile-make-mode.make
+++ b/lisp/Makefile-make-mode.make
@@ -1,5 +1,5 @@
##
-# Copyright (C) 2025 Charles Y. Choi
+# Copyright (C) 2025-2026 Charles Y. Choi
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -21,11 +21,5 @@ ELISP_INCLUDES=casual-make-utils.el \
casual-make-settings.el
ELISP_PACKAGES=
ELISP_TEST_INCLUDES=casual-make-test-utils.el
-PACKAGE_PATHS= \
--L $(EMACS_ELPA_DIR)/compat-current \
--L $(EMACS_ELPA_DIR)/seq-current \
--L $(EMACS_ELPA_DIR)/transient-current \
--L $(EMACS_ELPA_DIR)/cond-let-current \
--L $(CASUAL_LISP_DIR)
include Makefile--rules.make
diff --git a/lisp/Makefile-man.make b/lisp/Makefile-man.make
index 87abee4dec..c258d44911 100644
--- a/lisp/Makefile-man.make
+++ b/lisp/Makefile-man.make
@@ -1,5 +1,5 @@
##
-# Copyright (C) 2025 Charles Y. Choi
+# Copyright (C) 2025-2026 Charles Y. Choi
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -21,11 +21,5 @@ ELISP_INCLUDES=casual-man-utils.el \
casual-man-settings.el
ELISP_PACKAGES=
ELISP_TEST_INCLUDES=casual-man-test-utils.el
-PACKAGE_PATHS= \
--L $(EMACS_ELPA_DIR)/compat-current \
--L $(EMACS_ELPA_DIR)/seq-current \
--L $(EMACS_ELPA_DIR)/transient-current \
--L $(EMACS_ELPA_DIR)/cond-let-current \
--L $(CASUAL_LISP_DIR)
include Makefile--rules.make
diff --git a/lisp/Makefile-org.make b/lisp/Makefile-org.make
index a05615ad14..c4165c47ce 100644
--- a/lisp/Makefile-org.make
+++ b/lisp/Makefile-org.make
@@ -21,12 +21,7 @@ ELISP_INCLUDES=casual-org-utils.el \
casual-org-settings.el
ELISP_PACKAGES=
ELISP_TEST_INCLUDES=casual-org-test-utils.el
-PACKAGE_PATHS= \
--L $(EMACS_ELPA_DIR)/compat-current \
--L $(EMACS_ELPA_DIR)/seq-current \
--L $(EMACS_ELPA_DIR)/transient-current \
--L $(EMACS_ELPA_DIR)/cond-let-current \
--L $(EMACS_ELPA_DIR)/org-current \
--L $(CASUAL_LISP_DIR)
+PACKAGE_PATHS:=$(PACKAGE_PATHS) \
+-L $(EMACS_ELPA_DIR)/org-current
include Makefile--rules.make
diff --git a/lisp/Makefile-re-builder.make b/lisp/Makefile-re-builder.make
index b60f62640d..c0a094c42b 100644
--- a/lisp/Makefile-re-builder.make
+++ b/lisp/Makefile-re-builder.make
@@ -1,5 +1,5 @@
##
-# Copyright (C) 2024-2025 Charles Y. Choi
+# Copyright (C) 2024-2026 Charles Y. Choi
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -21,11 +21,5 @@ ELISP_INCLUDES=casual-re-builder-utils.el \
casual-re-builder-settings.el
ELISP_PACKAGES=
ELISP_TEST_INCLUDES=casual-re-builder-test-utils.el
-PACKAGE_PATHS= \
--L $(EMACS_ELPA_DIR)/compat-current \
--L $(EMACS_ELPA_DIR)/seq-current \
--L $(EMACS_ELPA_DIR)/transient-current \
--L $(EMACS_ELPA_DIR)/cond-let-current \
--L $(CASUAL_LISP_DIR)
include Makefile--rules.make
diff --git a/lisp/Makefile-timezone.make b/lisp/Makefile-timezone.make
index a28266d75b..f5e88f1f2c 100644
--- a/lisp/Makefile-timezone.make
+++ b/lisp/Makefile-timezone.make
@@ -1,5 +1,5 @@
##
-# Copyright (C) 2025 Charles Y. Choi
+# Copyright (C) 2025-2026 Charles Y. Choi
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -21,11 +21,5 @@ ELISP_INCLUDES=casual-timezone-utils.el \
casual-timezone-settings.el
ELISP_PACKAGES=
ELISP_TEST_INCLUDES=casual-timezone-test-utils.el
-PACKAGE_PATHS= \
--L $(EMACS_ELPA_DIR)/compat-current \
--L $(EMACS_ELPA_DIR)/seq-current \
--L $(EMACS_ELPA_DIR)/transient-current \
--L $(EMACS_ELPA_DIR)/cond-let-current \
--L $(CASUAL_LISP_DIR)
include Makefile--rules.make
