Merge from gnus--rel--5.10

[gnu-emacs] / lisp / pgg-gpg.el

diff --git a/lisp/pgg-gpg.el b/lisp/pgg-gpg.el
index 95c3e5e599620852652f81828327011dee18ae30..514be51a6a3e5636ff568b32714ac2e57c2f2ad3 100644 (file)
--- a/lisp/pgg-gpg.el
+++ b/lisp/pgg-gpg.el
@@ -94,8 +94,10 @@
            (if pgg-passphrase-coding-system
                (progn
                  (setq encoded-passphrase-with-new-line
-                       (encode-coding-string passphrase-with-newline
-                                             pgg-passphrase-coding-system))
+                       (encode-coding-string
+                        passphrase-with-newline
+                        (coding-system-change-eol-conversion
+                         pgg-passphrase-coding-system 'unix)))
                  (pgg-clear-string passphrase-with-newline))
              (setq encoded-passphrase-with-new-line passphrase-with-newline
                    passphrase-with-newline nil))