[Emacs-diffs] /srv/bzr/emacs/trunk r107349: nnimap.el (nnimap-request-list): Return the group names encoded as utf8. Otherwise non-European group names don't work.

[Katsumi Yamaoka]

------------------------------------------------------------
revno: 107349
author: Lars Ingebrigtsen <address@hidden>
committer: Katsumi Yamaoka <address@hidden>
branch nick: trunk
timestamp: Mon 2012-02-20 11:17:07 +0000
message:
  nnimap.el (nnimap-request-list): Return the group names encoded as utf8.  
Otherwise non-European group names don't work.
   (nnimap-request-newgroups): Ditto.
  gnus-sum.el (gnus-summary-insert-old-articles): Fix the syntax for the 
default in `read-string' (bug#10757).
modified:
  lisp/gnus/ChangeLog
  lisp/gnus/gnus-sum.el
  lisp/gnus/nnimap.el

=== modified file 'lisp/gnus/ChangeLog'
--- a/lisp/gnus/ChangeLog       2012-02-20 09:07:54 +0000
+++ b/lisp/gnus/ChangeLog       2012-02-20 11:17:07 +0000
@@ -1,5 +1,12 @@
 2012-02-20  Lars Ingebrigtsen  <address@hidden>
 
+       * nnimap.el (nnimap-request-list): Return the group names encoded as
+       utf8.  Otherwise non-European group names don't work.
+       (nnimap-request-newgroups): Ditto.
+
+       * gnus-sum.el (gnus-summary-insert-old-articles): Fix the syntax for
+       the default in `read-string' (bug#10757).
+
        * gnus-msg.el (gnus-group-post-news): Don't bug out on `C-u a' on
        topics (bug#10843).
 

=== modified file 'lisp/gnus/gnus-sum.el'
--- a/lisp/gnus/gnus-sum.el     2012-02-12 22:20:48 +0000
+++ b/lisp/gnus/gnus-sum.el     2012-02-20 11:17:07 +0000
@@ -12860,9 +12860,8 @@
                        (if initial "max" "default")
                        len)
                       nil nil
-                      (if initial
-                          (cons (number-to-string initial)
-                                0)))))
+                      (and initial
+                           (number-to-string initial)))))
                (unless (string-match "^[ \t]*$" input)
                  (setq all (string-to-number input))
                  (if (< all len)

=== modified file 'lisp/gnus/nnimap.el'
--- a/lisp/gnus/nnimap.el       2012-02-20 07:54:56 +0000
+++ b/lisp/gnus/nnimap.el       2012-02-20 11:17:07 +0000
@@ -1191,7 +1191,8 @@
          (dolist (response responses)
            (let* ((sequence (car response))
                   (response (cadr response))
-                  (group (cadr (assoc sequence sequences))))
+                  (group (cadr (assoc sequence sequences)))
+                  (egroup (encode-coding-string group 'utf-8)))
              (when (and group
                         (equal (caar response) "OK"))
                (let ((uidnext (nnimap-find-parameter "UIDNEXT" response))
@@ -1203,15 +1204,14 @@
                    (setq highest (1- (string-to-number (car uidnext)))))
                  (cond
                   ((null highest)
-                   (insert (format "%S 0 1 y\n" (utf7-decode group t))))
+                   (insert (format "%S 0 1 y\n" egroup)))
                   ((zerop exists)
                    ;; Empty group.
-                   (insert (format "%S %d %d y\n"
-                                   (utf7-decode group t)
+                   (insert (format "%S %d %d y\n" egroup
                                    highest (1+ highest))))
                   (t
                    ;; Return the widest possible range.
-                   (insert (format "%S %d 1 y\n" (utf7-decode group t)
+                   (insert (format "%S %d 1 y\n" egroup
                                    (or highest exists)))))))))
          t)))))
 
@@ -1223,7 +1223,7 @@
                       (nnimap-get-groups)))
        (unless (assoc group nnimap-current-infos)
          ;; Insert dummy numbers here -- they don't matter.
-         (insert (format "%S 0 1 y\n" (utf7-encode group)))))
+         (insert (format "%S 0 1 y\n" (encode-coding-string group 'utf-8)))))
       t)))
 
 (deffoo nnimap-retrieve-group-data-early (server infos)