summaryrefslogtreecommitdiff
path: root/lisp/epa-file.el
diff options
context:
space:
mode:
authorLars Ingebrigtsen <larsi@gnus.org>2020-08-24 20:50:08 +0200
committerLars Ingebrigtsen <larsi@gnus.org>2020-08-24 20:50:08 +0200
commit0980e1f537d48d6e1eb761b4a7a87878efffc12f (patch)
tree85b7ec6e50c4a3ca16d8195ae92a8df34228ebab /lisp/epa-file.el
parent9c04760f169904fc56745a29227f1d4219f16e0a (diff)
downloademacs-0980e1f537d48d6e1eb761b4a7a87878efffc12f.tar.gz
emacs-0980e1f537d48d6e1eb761b4a7a87878efffc12f.tar.bz2
emacs-0980e1f537d48d6e1eb761b4a7a87878efffc12f.zip
Fix error when loading a new, non-existent foo.gpg file
* lisp/epa-file.el (epa-file-insert-file-contents): Propagate the correct error upwards (bug introduced by fixing bug#3829, and messing up where the `when' form ended). Reported by "Herbert J. Skuhra" <herbert@gojira.at>.
Diffstat (limited to 'lisp/epa-file.el')
-rw-r--r--lisp/epa-file.el6
1 files changed, 3 insertions, 3 deletions
diff --git a/lisp/epa-file.el b/lisp/epa-file.el
index 3b0cc84e5f6..bb027b9abfb 100644
--- a/lisp/epa-file.el
+++ b/lisp/epa-file.el
@@ -175,9 +175,9 @@ encryption is used."
(setq-local epa-file-error error)
(add-hook 'find-file-not-found-functions
'epa-file--find-file-not-found-function
- nil t)
- (signal (if exists 'file-error 'file-missing)
- (cons "Opening input file" (cdr error))))))))
+ nil t)))
+ (signal (if exists 'file-error 'file-missing)
+ (cons "Opening input file" (cdr error))))))
(set-buffer buf) ;In case timer/filter changed/killed it (bug#16029)!
(setq-local epa-file-encrypt-to
(mapcar #'car (epg-context-result-for