diff options
| author | Lars Ingebrigtsen <larsi@gnus.org> | 2021-12-04 05:39:25 +0100 |
|---|---|---|
| committer | Lars Ingebrigtsen <larsi@gnus.org> | 2021-12-04 05:39:25 +0100 |
| commit | 644dd2f05059401116caf6c6e3574a2ac763e667 (patch) | |
| tree | 09e2b96f47168f3406459cebd787dbf9ede0fe58 /lisp/epa.el | |
| parent | 55ff91e822b3ffaf43ef2330aba33f2ba85ea12a (diff) | |
| download | emacs-644dd2f05059401116caf6c6e3574a2ac763e667.tar.gz emacs-644dd2f05059401116caf6c6e3574a2ac763e667.tar.bz2 emacs-644dd2f05059401116caf6c6e3574a2ac763e667.zip | |
Make the error message in epa-display-error more helpful
* lisp/epa.el (epa-display-error): Output a more helpful error
message when reading a keyring file (bug#12923).
Diffstat (limited to 'lisp/epa.el')
| -rw-r--r-- | lisp/epa.el | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/lisp/epa.el b/lisp/epa.el index e4b89e984d2..93c85bfd37c 100644 --- a/lisp/epa.el +++ b/lisp/epa.el @@ -607,7 +607,11 @@ If SECRET is non-nil, list secret keys instead of public keys." (_ "Error while executing \"%s\":\n\n")) (epg-context-program context)) "\n\n" - (epg-context-error-output context))) + (epg-context-error-output context) + (if (string-search "Unexpected error" + (epg-context-error-output context)) + "\n(File possibly not an encrypted file, but is perhaps a key ring file?)\n" + ""))) (epa-info-mode) (goto-char (point-min))) (display-buffer buffer))))) |