diff --git a/init.el b/init.el index 27e0a58..4efb961 100644 --- a/init.el +++ b/init.el @@ -64,7 +64,7 @@ If freezing sometimes, decrease it. If stuttering, increase it.") (let ((disable-warning-file (file-name-concat creature/cache-dir "disabled-warning.el"))) (when (file-exists-p disable-warning-file) (load disable-warning-file))) -(add-to-list 'load-path (expand-file-name "lisp" creature/config-dir) t) +(add-to-list 'load-path (expand-file-name "lisp" creature/config-dir)) (require 'init-modeline) diff --git a/lisp/init-git.el b/lisp/init-git.el index ce84187..ae6a51f 100644 --- a/lisp/init-git.el +++ b/lisp/init-git.el @@ -54,12 +54,6 @@ (setq ediff-split-window-function 'split-window-horizontally) (setq ediff-window-setup-function 'ediff-setup-windows-plain) -(with-eval-after-load 'transient - (unless (fboundp 'transient-define-group) - (let ((file (file-name-concat - creature/pkg-dir "transient/lisp/transient.el"))) - (when (file-exists-p file) (load file))))) - (with-eval-after-load 'project (require 'magit)) diff --git a/lisp/init-package.el b/lisp/init-package.el index 610a0ac..1fbb55a 100644 --- a/lisp/init-package.el +++ b/lisp/init-package.el @@ -36,22 +36,28 @@ Do this recursively for subdirectories of DIR." (when (cl-some (lambda (file) (member (file-name-extension file) load-extension)) files) - (add-to-list 'load-path dir t)) + (add-to-list 'load-path dir)) (mapc #'add-dir-and-subdirs-to-load-path subdirs))) (defun add-pkg-in-pkg-dir (pkg) "Add PKG located in `creature/pkg-dir' to `load-path'." (add-dir-and-subdirs-to-load-path (expand-file-name pkg creature/pkg-dir))) -(add-to-list 'load-path creature/pkg-dir t) +(add-to-list 'load-path creature/pkg-dir) ;; add basic packages (add-pkg-in-pkg-dir "lazy-load") -;; builtin maybe exist -;; "compat" "transient" -(dolist (pkg '("compat" "transient")) - (unless (locate-library pkg) - (add-pkg-in-pkg-dir pkg))) +;; "transient" and "compat" always use submodule package +;; and "cond-let" is dependency of "transient" +(dolist (pkg '("transient" "cond-let" "compat")) + (add-pkg-in-pkg-dir pkg)) + +(dolist (pkg '("transient" "compat")) + (let ((file (locate-library pkg)) + (feature (intern-soft pkg))) + (when (and (featurep feature) (string-prefix-p "/usr/share/emacs" file)) + (unload-feature feature t) + (require feature)))) (provide 'init-package)