diff options
| author | Xiyue Deng <manphiz@debian.org> | 2026-06-04 00:31:41 -0700 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2026-06-04 11:52:14 +0300 |
| commit | aa6acc69edb64eb962beb074c065c7b44c194da7 (patch) | |
| tree | b0f811dcc047437bf61337e24fa2696ec0bcb9b3 | |
| parent | e6e79b1e090df382ccc25c01305035b16cf3b8b6 (diff) | |
plstore: use 'plstore--has-secret-keys'
* lisp/plstore.el (plstore-find, plstore-get, plstore--encode)
(plstore--decode): Use 'plstore--has-secret-keys' to replace
manual check for existence of secret keys. (Bug#81061)
| -rw-r--r-- | lisp/plstore.el | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lisp/plstore.el b/lisp/plstore.el index 2fada5a308d..6a1d858f958 100644 --- a/lisp/plstore.el +++ b/lisp/plstore.el @@ -478,7 +478,7 @@ perform a match." (when match (setq plist (cdr entry)) (while plist - (if (string-match "\\`:secret-" (symbol-name (car plist))) + (if (plstore--has-secret-keys plstore) (setq decrypt t plist nil)) (setq plist (nthcdr 2 plist))) @@ -503,7 +503,7 @@ Return nil if there is none." plist) (setq plist (cdr entry)) (while plist - (if (string-match "\\`:secret-" (symbol-name (car plist))) + (if (plstore--has-secret-keys plstore) (progn (plstore--decrypt plstore) (setq entry (assoc name (plstore--get-merged-alist plstore)) @@ -663,7 +663,7 @@ GnuPG key, silently save with symmetric encryption." ; (FIXME) (let ((merged-plist (cdr (assoc (car entry) merged-alist))) (plist (cdr entry))) (while plist - (if (string-match "\\`:secret-" (symbol-name (car plist))) + (if (plstore--has-secret-keys plstore) (setcar (cdr plist) (plist-get merged-plist @@ -691,7 +691,7 @@ some plstore." (error "Invalid plstore format %s" string)) (setq plist (cdr (car pointer))) (while plist - (when (string-match "\\`:secret-" (symbol-name (car plist))) + (when (plstore--has-secret-keys plstore) (setq entry (assoc (car (car pointer)) secret-alist)) (unless entry (setq entry (list (car (car pointer))) |