# HG changeset patch
# User Miles Bader <miles@gnu.org>
# Date 1157608734 0
# Node ID 2f8ec29373d17b9b866e7614ebdc8b4474082f0f
# Parent  66699c76726f93c5dd41a0672eded1a87f9b3397
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

diff -r 66699c76726f -r 2f8ec29373d1 lisp/ChangeLog
--- a/lisp/ChangeLog	Wed Sep 06 17:53:59 2006 +0000
+++ b/lisp/ChangeLog	Thu Sep 07 05:58:54 2006 +0000
@@ -1,3 +1,9 @@
+2006-09-06  Daiki Ueno  <ueno@unixuser.org>
+
+	* pgg-gpg.el (pgg-gpg-process-region): Encode passphrase with
+	pgg-passphrase-coding-system rather than locale-coding-system.
+	* pgg-def.el (pgg-passphrase-coding-system): New user option.
+
 2006-09-06  Stefan Monnier  <monnier@iro.umontreal.ca>
 
 	* progmodes/prolog.el: Remove * in docstrings.
diff -r 66699c76726f -r 2f8ec29373d1 lisp/gnus/ChangeLog
--- a/lisp/gnus/ChangeLog	Wed Sep 06 17:53:59 2006 +0000
+++ b/lisp/gnus/ChangeLog	Thu Sep 07 05:58:54 2006 +0000
@@ -2873,7 +2873,7 @@
 
 	* gnus.el (gnus-group-startup-message): Search for gnus images in
 	etc/images/gnus.
-	* mm-util.el (mm-find-charset-region): Likewise.
+	* mm-util.el (mm-image-load-path): Likewise.
 	* smiley.el (smiley-data-directory): Search for smilies in
 	etc/images/smilies.
 
diff -r 66699c76726f -r 2f8ec29373d1 lisp/pgg-def.el
--- a/lisp/pgg-def.el	Wed Sep 06 17:53:59 2006 +0000
+++ b/lisp/pgg-def.el	Thu Sep 07 05:58:54 2006 +0000
@@ -71,6 +71,13 @@
   :group 'pgg
   :type 'integer)
 
+(defcustom pgg-passphrase-coding-system
+  (if (boundp 'locale-coding-system)
+      locale-coding-system)
+  "Coding system to encode passphrase."
+  :group 'pgg
+  :type 'coding-system)
+
 (defvar pgg-messages-coding-system nil
   "Coding system used when reading from a PGP external process.")
 
diff -r 66699c76726f -r 2f8ec29373d1 lisp/pgg-gpg.el
--- 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))