procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge from gnus--rel--5.10

Browse source 
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
This commit is contained in:
Miles Bader 2006-09-07 05:58:54 +00:00
parent be9b5a6076
commit 31a7c2ff1f
4 changed files with 16 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lisp/ChangeLog
View file

@ -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.

2
lisp/gnus/ChangeLog
View file

@ -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.

7
lisp/pgg-def.el
View file

@ -71,6 +71,13 @@ Whether the passphrase is cached at all is controlled by
: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.")

4
lisp/pgg-gpg.el
View file

@ -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))