Commit 9f82622d authored by Jonas Bernoulli's avatar Jonas Bernoulli

Cosmetic changes to epa libraries

These changes make the code more readable.

* lisp/epa-dired.el (epa-dired-do-decrypt, epa-dired-do-verify)
(epa-dired-do-sign, epa-dired-do-encrypt): Use dolist instead
of while.
* lisp/epa-file.el (epa-file-passphrase-callback-function):
Set just one variable per setq call.
parent e78c15ac
......@@ -29,48 +29,40 @@
(defun epa-dired-do-decrypt ()
"Decrypt marked files."
(interactive)
(let ((file-list (dired-get-marked-files)))
(while file-list
(epa-decrypt-file (expand-file-name (car file-list)))
(setq file-list (cdr file-list)))
(revert-buffer)))
(dolist (file (dired-get-marked-files))
(epa-decrypt-file (expand-file-name file)))
(revert-buffer))
;;;###autoload
(defun epa-dired-do-verify ()
"Verify marked files."
(interactive)
(let ((file-list (dired-get-marked-files)))
(while file-list
(epa-verify-file (expand-file-name (car file-list)))
(setq file-list (cdr file-list)))))
(dolist (file (dired-get-marked-files))
(epa-verify-file (expand-file-name file))))
;;;###autoload
(defun epa-dired-do-sign ()
"Sign marked files."
(interactive)
(let ((file-list (dired-get-marked-files)))
(while file-list
(epa-sign-file
(expand-file-name (car file-list))
(epa-select-keys (epg-make-context) "Select keys for signing.
(dolist (file (dired-get-marked-files))
(epa-sign-file
(expand-file-name file)
(epa-select-keys (epg-make-context) "Select keys for signing.
If no one is selected, default secret key is used. "
nil t)
(y-or-n-p "Make a detached signature? "))
(setq file-list (cdr file-list)))
(revert-buffer)))
nil t)
(y-or-n-p "Make a detached signature? ")))
(revert-buffer))
;;;###autoload
(defun epa-dired-do-encrypt ()
"Encrypt marked files."
(interactive)
(let ((file-list (dired-get-marked-files)))
(while file-list
(epa-encrypt-file
(expand-file-name (car file-list))
(epa-select-keys (epg-make-context) "Select recipients for encryption.
If no one is selected, symmetric encryption will be performed. "))
(setq file-list (cdr file-list)))
(revert-buffer)))
(dolist (file (dired-get-marked-files))
(epa-encrypt-file
(expand-file-name file)
(epa-select-keys (epg-make-context) "Select recipients for encryption.
If no one is selected, symmetric encryption will be performed. ")))
(revert-buffer))
(provide 'epa-dired)
......
......@@ -61,8 +61,8 @@ encryption is used."
(or (copy-sequence (cdr entry))
(progn
(unless entry
(setq entry (list file)
epa-file-passphrase-alist
(setq entry (list file))
(setq epa-file-passphrase-alist
(cons entry
epa-file-passphrase-alist)))
(setq passphrase (epa-passphrase-callback-function context
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment