diff options
| author | Tetsuo Tsukamoto | 2011-09-11 08:20:33 +0000 |
|---|---|---|
| committer | Katsumi Yamaoka | 2011-09-11 08:20:33 +0000 |
| commit | c36da500061f83c5ef9aac9373acd45c6e01137a (patch) | |
| tree | 2ef31cd1165534bf2d2c6041813ae0b6ef2c3c2f /lisp | |
| parent | b885bf36cf2c7f79517a1c797fd09e7adc3358c6 (diff) | |
| download | emacs-c36da500061f83c5ef9aac9373acd45c6e01137a.tar.gz emacs-c36da500061f83c5ef9aac9373acd45c6e01137a.zip | |
nnrss.el (nnrss-retrieve-groups): Decode the charset before looking up the file (bug#9351).
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/gnus/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/gnus/nnrss.el | 3 |
2 files changed, 7 insertions, 1 deletions
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index e9e887dd34c..89a83543eb0 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2011-09-10 Tetsuo Tsukamoto <tt.tetsuo.tsukamoto@gmail.com> (tiny change) | ||
| 2 | |||
| 3 | * nnrss.el (nnrss-retrieve-groups): Decode the charset before looking | ||
| 4 | up the file (bug#9351). | ||
| 5 | |||
| 1 | 2011-09-10 Lars Magne Ingebrigtsen <larsi@gnus.org> | 6 | 2011-09-10 Lars Magne Ingebrigtsen <larsi@gnus.org> |
| 2 | 7 | ||
| 3 | * nnimap.el: Redo the charset handling. Let Gnus encode the names, as | 8 | * nnimap.el: Redo the charset handling. Let Gnus encode the names, as |
diff --git a/lisp/gnus/nnrss.el b/lisp/gnus/nnrss.el index b12700fac64..3e3b7326f29 100644 --- a/lisp/gnus/nnrss.el +++ b/lisp/gnus/nnrss.el | |||
| @@ -363,12 +363,13 @@ for decoding when the cdr that the data specify is not available.") | |||
| 363 | 363 | ||
| 364 | (deffoo nnrss-retrieve-groups (groups &optional server) | 364 | (deffoo nnrss-retrieve-groups (groups &optional server) |
| 365 | (dolist (group groups) | 365 | (dolist (group groups) |
| 366 | (setq group (nnrss-decode-group-name group)) | ||
| 366 | (nnrss-possibly-change-group group server) | 367 | (nnrss-possibly-change-group group server) |
| 367 | (nnrss-check-group group server)) | 368 | (nnrss-check-group group server)) |
| 368 | (with-current-buffer nntp-server-buffer | 369 | (with-current-buffer nntp-server-buffer |
| 369 | (erase-buffer) | 370 | (erase-buffer) |
| 370 | (dolist (group groups) | 371 | (dolist (group groups) |
| 371 | (let ((elem (assoc group nnrss-server-data))) | 372 | (let ((elem (assoc (gnus-group-decoded-name group) nnrss-server-data))) |
| 372 | (insert (format "%S %s 1 y\n" group (or (cadr elem) 0))))) | 373 | (insert (format "%S %s 1 y\n" group (or (cadr elem) 0))))) |
| 373 | 'active)) | 374 | 'active)) |
| 374 | 375 | ||