Mercurial > emacs
diff lisp/pgg-gpg.el @ 72686:2f8ec29373d1
Merge from gnus--rel--5.10
Patches applied:
* gnus--rel--5.10 (patch 134-135)
- Merge from emacs--devo--0
- Update from CVS
2006-09-06 Daiki Ueno <ueno@unixuser.org>
* lisp/pgg-gpg.el (pgg-gpg-process-region): Encode passphrase with
pgg-passphrase-coding-system rather than locale-coding-system.
* lisp/pgg-def.el (pgg-passphrase-coding-system): New user option.
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-428
| author | Miles Bader <miles@gnu.org> |
|---|---|
| date | Thu, 07 Sep 2006 05:58:54 +0000 |
| parents | 87c011891481 |
| children | 8efc97426784 |
line wrap: on
line diff
--- a/lisp/pgg-gpg.el Wed Sep 06 17:53:59 2006 +0000 +++ b/lisp/pgg-gpg.el Thu Sep 07 05:58:54 2006 +0000 @@ -91,11 +91,11 @@ (set-process-sentinel process #'ignore) (when passphrase (setq passphrase-with-newline (concat passphrase "\n")) - (if (boundp 'locale-coding-system) + (if pgg-passphrase-coding-system (progn (setq encoded-passphrase-with-new-line (encode-coding-string passphrase-with-newline - locale-coding-system)) + pgg-passphrase-coding-system)) (pgg-clear-string passphrase-with-newline)) (setq encoded-passphrase-with-new-line passphrase-with-newline passphrase-with-newline nil))