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/gnus/ChangeLog | |
| parent | be9b5a607607e3e77815c358274f39b0fbed6bf3 (diff) | |
| download | emacs-31a7c2ff1f7c3addb7c945f688bcb37d893d761a.tar.gz emacs-31a7c2ff1f7c3addb7c945f688bcb37d893d761a.tar.bz2 emacs-31a7c2ff1f7c3addb7c945f688bcb37d893d761a.zip | |
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/gnus/ChangeLog')
| -rw-r--r-- | lisp/gnus/ChangeLog | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index 142bb93bef4..312d822e375 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog @@ -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. |