Mercurial > emacs
diff lisp/gnus/ChangeLog @ 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 | afe113527b71 |
children | 709ee6c1e02a |
line wrap: on
line diff
--- 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.