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

; Fix last change

Browse source 
* lisp/plstore.el (plstore--decode, plstore--encode)
(plstore-get, plstore-find): Fix last change.  (Bug#81061)
This commit is contained in:
Eli Zaretskii 2026-06-04 14:47:13 +03:00
parent aa6acc69ed
commit 8a00733af5
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 (when match
(setq plist (cdr entry)) (setq plist (cdr entry))
(while plist (while plist
(if (plstore--has-secret-keys plstore) (if (plstore--has-secret-keys plist)
(setq decrypt t (setq decrypt t
plist nil)) plist nil))
(setq plist (nthcdr 2 plist))) (setq plist (nthcdr 2 plist)))
@ -503,7 +503,7 @@ Return nil if there is none."
plist) plist)
(setq plist (cdr entry)) (setq plist (cdr entry))
(while plist (while plist
(if (plstore--has-secret-keys plstore) (if (plstore--has-secret-keys plist)
(progn (progn
(plstore--decrypt plstore) (plstore--decrypt plstore)
(setq entry (assoc name (plstore--get-merged-alist 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))) (let ((merged-plist (cdr (assoc (car entry) merged-alist)))
(plist (cdr entry))) (plist (cdr entry)))
(while plist (while plist
(if (plstore--has-secret-keys plstore) (if (plstore--has-secret-keys plist)
(setcar (cdr plist) (setcar (cdr plist)
(plist-get (plist-get
merged-plist merged-plist
@ -691,7 +691,7 @@ some plstore."
(error "Invalid plstore format %s" string)) (error "Invalid plstore format %s" string))
(setq plist (cdr (car pointer))) (setq plist (cdr (car pointer)))
(while plist (while plist
(when (plstore--has-secret-keys plstore) (when (plstore--has-secret-keys plist)
(setq entry (assoc (car (car pointer)) secret-alist)) (setq entry (assoc (car (car pointer)) secret-alist))
(unless entry (unless entry
(setq entry (list (car (car pointer))) (setq entry (list (car (car pointer)))