diff options
| author | Miles Bader <miles@gnu.org> | 2006-09-07 05:58:54 +0000 |
|---|---|---|
| committer | Miles Bader <miles@gnu.org> | 2006-09-07 05:58:54 +0000 |
| commit | 31a7c2ff1f7c3addb7c945f688bcb37d893d761a (patch) | |
| tree | 742668cfc3643490fce7ff24a7e93174ddfdc5b6 /lisp/pgg-gpg.el | |
| parent | be9b5a607607e3e77815c358274f39b0fbed6bf3 (diff) | |
| download | emacs-31a7c2ff1f7c3addb7c945f688bcb37d893d761a.tar.gz | |
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
Diffstat (limited to 'lisp/pgg-gpg.el')
| -rw-r--r-- | lisp/pgg-gpg.el | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/pgg-gpg.el b/lisp/pgg-gpg.el index 07be6c47f61..4b8b79b068e 100644 --- a/lisp/pgg-gpg.el +++ b/lisp/pgg-gpg.el @@ -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)) |