From 8d4bcd62cc69e47b9048d2036c776a4626cc2872 Mon Sep 17 00:00:00 2001 From: Martin Polden Date: Sun, 28 Mar 2021 13:48:05 +0200 Subject: package: Rename variable --- README.md | 7 ++++--- lisp/init-package.el | 13 +++++++------ 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index d1c5557..11f9169 100644 --- a/README.md +++ b/README.md @@ -77,9 +77,10 @@ Start Emacs! Local customizations can be added to `lisp/init-local.el`. This file is in `.gitignore`. -Setting the variable `mpolden/inhibited-packages` (e.g. in `lisp/init-local.el`) -allows inhibiting loading of one or more packages. Example: +Setting the variable `mpolden/inhibited-features` (e.g. in `lisp/init-local.el`) +allows inhibiting loading of one or more features, i.e. files in `lisp`. +Example: ``` emacs-lisp -(setq mpolden/inhibited-packages '(init-foo)) +(setq mpolden/inhibited-features '(init-foo init-bar)) ``` diff --git a/lisp/init-package.el b/lisp/init-package.el index 5a02b33..53c50c4 100644 --- a/lisp/init-package.el +++ b/lisp/init-package.el @@ -29,14 +29,15 @@ re-downloaded in order to locate PACKAGE." "Install a list of PACKAGES." (mapcar (lambda (package) (mpolden/require-package package)) packages)) -(defvar mpolden/inhibited-packages nil "List of packages that should not be loaded.") +(defvar mpolden/inhibited-features nil "List of features that should not be loaded.") -(define-obsolete-variable-alias 'inhibited-packages 'mpolden/inhibited-packages) +(define-obsolete-variable-alias 'inhibited-packages 'mpolden/inhibited-features) +(define-obsolete-variable-alias 'mpolden/inhibited-packages 'mpolden/inhibited-features) -(defun mpolden/maybe-require (package) - "Load PACKAGE if it's not inhibited." - (unless (memq package mpolden/inhibited-packages) - (require package))) +(defun mpolden/maybe-require (feature) + "Load FEATURE if it's not inhibited." + (unless (memq feature mpolden/inhibited-features) + (require feature))) ;; install use-package and diminish (mpolden/require-packages '(use-package diminish)) -- cgit v1.2.3