diff options
| author | Lars Ingebrigtsen | 2020-08-24 20:50:08 +0200 |
|---|---|---|
| committer | Lars Ingebrigtsen | 2020-08-24 20:50:08 +0200 |
| commit | 0980e1f537d48d6e1eb761b4a7a87878efffc12f (patch) | |
| tree | 85b7ec6e50c4a3ca16d8195ae92a8df34228ebab | |
| parent | 9c04760f169904fc56745a29227f1d4219f16e0a (diff) | |
| download | emacs-0980e1f537d48d6e1eb761b4a7a87878efffc12f.tar.gz 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>.
| -rw-r--r-- | lisp/epa-file.el | 6 |
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." | |||
| 175 | (setq-local epa-file-error error) | 175 | (setq-local epa-file-error error) |
| 176 | (add-hook 'find-file-not-found-functions | 176 | (add-hook 'find-file-not-found-functions |
| 177 | 'epa-file--find-file-not-found-function | 177 | 'epa-file--find-file-not-found-function |
| 178 | nil t) | 178 | nil t))) |
| 179 | (signal (if exists 'file-error 'file-missing) | 179 | (signal (if exists 'file-error 'file-missing) |
| 180 | (cons "Opening input file" (cdr error)))))))) | 180 | (cons "Opening input file" (cdr error)))))) |
| 181 | (set-buffer buf) ;In case timer/filter changed/killed it (bug#16029)! | 181 | (set-buffer buf) ;In case timer/filter changed/killed it (bug#16029)! |
| 182 | (setq-local epa-file-encrypt-to | 182 | (setq-local epa-file-encrypt-to |
| 183 | (mapcar #'car (epg-context-result-for | 183 | (mapcar #'car (epg-context-result-for |