[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r105389: Merge changes made in Gnus t
From: |
Katsumi Yamaoka |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r105389: Merge changes made in Gnus trunk. |
Date: |
Tue, 02 Aug 2011 22:16:33 +0000 |
User-agent: |
Bazaar (2.3.1) |
------------------------------------------------------------
revno: 105389
author: Gnus developers <address@hidden>
committer: Katsumi Yamaoka <address@hidden>
branch nick: trunk
timestamp: Tue 2011-08-02 22:16:33 +0000
message:
Merge changes made in Gnus trunk.
nnir.el (nnir-search-thread): Position point on referring article line.
(nnir-warp-to-article): Clean up summary buffers.
nnimap.el (nnimap-request-thread): Whitespace fix.
nnimap.el (nnimap-get-groups): Decode "&" correctly.
modified:
lisp/gnus/ChangeLog
lisp/gnus/nnimap.el
lisp/gnus/nnir.el
=== modified file 'lisp/gnus/ChangeLog'
--- a/lisp/gnus/ChangeLog 2011-08-02 13:30:46 +0000
+++ b/lisp/gnus/ChangeLog 2011-08-02 22:16:33 +0000
@@ -1,3 +1,15 @@
+2011-08-02 Andrew Cohen <address@hidden>
+
+ * nnir.el (nnir-search-thread): Position point on referring article
+ line.
+ (nnir-warp-to-article): Clean up summary buffers.
+
+ * nnimap.el (nnimap-request-thread): Whitespace fix.
+
+2011-08-02 Steve Purcell <address@hidden> (tiny change)
+
+ * nnimap.el (nnimap-get-groups): Decode "&" correctly.
+
2011-08-02 Lars Magne Ingebrigtsen <address@hidden>
* starttls.el (starttls-available-p): Renamed from
=== modified file 'lisp/gnus/nnimap.el'
--- a/lisp/gnus/nnimap.el 2011-07-24 22:15:15 +0000
+++ b/lisp/gnus/nnimap.el 2011-08-02 22:16:33 +0000
@@ -1107,9 +1107,9 @@
(separator (read (current-buffer)))
(group (read (current-buffer))))
(unless (member '%NoSelect flags)
- (push (if (stringp group)
- group
- (format "%s" group))
+ (push (utf7-decode (if (stringp group)
+ group
+ (format "%s" group)) t)
groups))))
(nreverse groups)))
@@ -1168,7 +1168,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" group))))
+ (insert (format "%S 0 1 y\n" (utf7-encode group)))))
t)))
(deffoo nnimap-retrieve-group-data-early (server infos)
@@ -1566,7 +1566,7 @@
(articles &optional limit force-new dependencies))
(deffoo nnimap-request-thread (header &optional group server)
- (if gnus-refer-thread-use-nnir
+ (if gnus-refer-thread-use-nnir
(nnir-search-thread header)
(when (nnimap-possibly-change-group group server)
(let* ((cmd (nnimap-make-thread-query header))
=== modified file 'lisp/gnus/nnir.el'
--- a/lisp/gnus/nnir.el 2011-07-24 00:19:29 +0000
+++ b/lisp/gnus/nnir.el 2011-08-02 22:16:33 +0000
@@ -767,11 +767,18 @@
(deffoo nnir-warp-to-article ()
(let* ((cur (if (> (gnus-summary-article-number) 0)
(gnus-summary-article-number)
- (error "This is not a real article.")))
- (gnus-newsgroup-name (nnir-article-group cur))
- (backend-number (nnir-article-number cur)))
- (gnus-summary-read-group-1 gnus-newsgroup-name t t gnus-summary-buffer
- nil (list backend-number))))
+ (error "This is not a real article")))
+ (backend-article-group (nnir-article-group cur))
+ (backend-article-number (nnir-article-number cur))
+ (quit-config (gnus-ephemeral-group-p gnus-newsgroup-name)))
+ ;; first exit from the nnir summary buffer.
+ (gnus-summary-exit)
+ ;; and if the nnir summary buffer in turn came from another
+ ;; summary buffer we have to clean that summary up too.
+ (when (eq (cdr quit-config) 'summary)
+ (gnus-summary-exit))
+ (gnus-summary-read-group-1 backend-article-group t t nil
+ nil (list backend-article-number))))
(nnoo-define-skeleton nnir)
@@ -1659,7 +1666,8 @@
(cons 'server (gnus-method-to-server
(gnus-find-method-for-group
gnus-newsgroup-name))))))
- (gnus-group-make-nnir-group nil parm)))
+ (gnus-group-make-nnir-group nil parm)
+ (gnus-summary-goto-subject (gnus-id-to-article (mail-header-id header)))))
;; unused?
(defun nnir-artlist-groups (artlist)
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r105389: Merge changes made in Gnus trunk.,
Katsumi Yamaoka <=