From f24725382f46496e21d8d86f738a3e33afc78b45 Mon Sep 17 00:00:00 2001 From: Brandon Orther Date: Tue, 27 Mar 2018 19:37:43 -0700 Subject: [PATCH] Update password-store +auth to only use auth-source-pass Now that auth-password-store has been renamed to auth-source-pass and it matches the same feature included in emacs 26 under the same name we don't need custom checks and package loading. --- modules/tools/password-store/autoload.el | 4 +--- modules/tools/password-store/config.el | 8 +++----- modules/tools/password-store/packages.el | 4 +++- 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/modules/tools/password-store/autoload.el b/modules/tools/password-store/autoload.el index f22d18393..cbed035e8 100644 --- a/modules/tools/password-store/autoload.el +++ b/modules/tools/password-store/autoload.el @@ -12,9 +12,7 @@ ;;;###autoload (defalias '+pass--get-entry - (if (featurep 'auth-store-pass) - #'auth-source-pass-parse-entry - #'auth-pass-parse-entry)) + #'auth-source-pass-parse-entry) ;;;###autoload (defun +pass-get-field (entry fields) diff --git a/modules/tools/password-store/config.el b/modules/tools/password-store/config.el index 63c6eafdd..f57b69c8d 100644 --- a/modules/tools/password-store/config.el +++ b/modules/tools/password-store/config.el @@ -36,8 +36,6 @@ ;; Is built into Emacs 26+ -(when (featurep! +auth) - (if (require 'auth-store-pass nil t) - (auth-source-pass-enable) - (def-package! auth-source-store - :config (auth-source-pass-enable)))) +(def-package! auth-source-pass + :when (featurep! +auth) + :config (auth-source-pass-enable)) diff --git a/modules/tools/password-store/packages.el b/modules/tools/password-store/packages.el index 2a047fdd0..6827fc23e 100644 --- a/modules/tools/password-store/packages.el +++ b/modules/tools/password-store/packages.el @@ -3,7 +3,9 @@ (package! pass) (package! password-store) -(package! auth-source-pass) + +(when (featurep! +auth) + (package! auth-source-pass)) (when (featurep! :completion helm) (package! helm-pass))