diff options
Diffstat (limited to 'lisp/epa.el')
| -rw-r--r-- | lisp/epa.el | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/lisp/epa.el b/lisp/epa.el index d4ff3d1ee73..742c37d085b 100644 --- a/lisp/epa.el +++ b/lisp/epa.el @@ -235,11 +235,6 @@ You should bind this variable with `let', but do not set it globally.") (define-key keymap "q" 'epa-exit-buffer) keymap)) -(defvar epa-info-mode-map - (let ((keymap (make-sparse-keymap))) - (define-key keymap "q" 'delete-window) - keymap)) - (defvar epa-exit-buffer-function #'quit-window) (defun epa--button-key-text (key) @@ -607,7 +602,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))))) @@ -648,7 +647,7 @@ If SECRET is non-nil, list secret keys instead of public keys." (setq input (file-name-sans-extension (expand-file-name input))) (expand-file-name (read-file-name - (concat "To file (default " (file-name-nondirectory input) ") ") + (format-prompt "To file" (file-name-nondirectory input)) (file-name-directory input) input))) @@ -1236,9 +1235,7 @@ If no one is selected, symmetric encryption will be performed. ") (list keys (expand-file-name (read-file-name - (concat "To file (default " - (file-name-nondirectory default-name) - ") ") + (format-prompt "To file" (file-name-nondirectory default-name)) (file-name-directory default-name) default-name))))) (let ((context (epg-make-context epa-protocol))) |