Github/emacs
2
0
Fork 1
mirror of git://git.sv.gnu.org/emacs.git synced 2026-06-14 04:21:24 +00:00
Code Issues Projects Releases Packages Wiki Activity

plstore: use 'plstore--has-secret-keys'

Browse source 
* 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)
This commit is contained in:
Xiyue Deng 2026-06-04 00:31:41 -07:00 committed by Eli Zaretskii
parent e6e79b1e09
commit aa6acc69ed
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
lisp/plstore.el
View file

@ -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)))