* epa.el (epa-keys-mode): Don't call widget-setup.

[elisp/epg.git] / epg.el

diff --git a/epg.el b/epg.el
index 1ae12b5..2aaa58f 100644 (file)
--- a/epg.el
+++ b/epg.el
@@ -1224,7 +1224,8 @@ This function is for internal use only."
                        (setq encoded-passphrase-with-new-line
                              (encode-coding-string
                               passphrase-with-new-line
-                              epg-passphrase-coding-system))
+                              (coding-system-change-eol-conversion
+                               epg-passphrase-coding-system 'unix)))
                        (epg--clear-string passphrase-with-new-line)
                        (setq passphrase-with-new-line nil))
                    (setq encoded-passphrase-with-new-line
@@ -2343,8 +2344,8 @@ If you are unsure, use synchronous version of this function
          (if entry
              (if (setq entry (assq (cdr entry)
                                    epg-delete-problem-reason-alist))
-                 (error "Delete keys failed: %s" (cdr entry)))
-           (error "Delete keys failed" (cdr entry)))))
+                 (error "Delete keys failed: %s" (cdr entry))
+               (error "Delete keys failed")))))
     (epg-reset context)))
 
 ;;;###autoload