Merge from gnus--devo--0

Revision: emacs@sv.gnu.org/emacs--devo--0--patch-1110

3 files changed, 21 insertions, 2 deletions

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 5710f01ccaa..96cc3112700 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -30,6 +30,20 @@
         * gnus-win.el (gnus-configure-frame, gnus-all-windows-visible-p):
         Fix last change in case the element is not even a symbol.
 
+2008-04-02  Simon Josefsson  <simon@josefsson.org>
+
+        * nnimap.el (nnimap-enable-minmax-bug-workaround): Remove, replaced by
+        imap-enable-exchange-bug-workaround.
+        (nnimap-find-minmax-uid): Use imap-enable-exchange-bug-workaround.
+
+2008-04-01  Simon Josefsson  <simon@josefsson.org>
+
+        * nnimap.el (nnimap-find-minmax-uid): Revert last fix, the "fix" turns
+        a 100 byte status-checks into a 2-3MB transfer for each group.
+        (nnimap-enable-minmax-bug-workaround): New variable to toggle whether
+        to enable bug workaround or not.
+        (nnimap-find-minmax-uid): Only enable workaround conditionally.
+
 2008-03-31  Glenn Morris  <rgm@gnu.org>
 
         * message.el (mml2015-use): Declare for compiler.
@@ -46,6 +60,10 @@
         (nntp-open-netcat-stream): New function.
         (nntp-open-via-rlogin-and-netcat): Don't use a pty.
 
+2008-03-29  Sven Joachim  <svenjoac@gmx.de>
+
+        * gnus-sum.el (gnus-summary-make-menu-bar): Add missing dots.
+
 2008-03-29  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * message.el (message-make-in-reply-to): Use mm-with-multibyte-buffer.
diff --git a/lisp/gnus/gnus-sum.el b/lisp/gnus/gnus-sum.el
index 2e3b55a0c42..0d76e63bf74 100644
--- a/lisp/gnus/gnus-sum.el
+++ b/lisp/gnus/gnus-sum.el
@@ -2262,7 +2262,7 @@ increase the score of each group you read."
           ["Set mark below..." gnus-score-set-mark-below t]
           ["Set expunge below..." gnus-score-set-expunge-below t]
           ["Edit current score file" gnus-score-edit-current-scores t]
-          ["Edit score file" gnus-score-edit-file t]
+          ["Edit score file..." gnus-score-edit-file t]
           ["Trace score" gnus-score-find-trace t]
           ["Find words" gnus-score-find-favourite-words t]
           ["Rescore buffer" gnus-summary-rescore t]
diff --git a/lisp/gnus/nnimap.el b/lisp/gnus/nnimap.el
index b2d23d32a80..45f794626a6 100644
--- a/lisp/gnus/nnimap.el
+++ b/lisp/gnus/nnimap.el
@@ -555,7 +555,8 @@ If EXAMINE is non-nil the group is selected read-only."
               (imap-mailbox-select group examine))
       (let (minuid maxuid)
         (when (> (imap-mailbox-get 'exists) 0)
-          (imap-fetch "1:*" "UID" nil 'nouidfetch)
+          (imap-fetch (if imap-enable-exchange-bug-workaround "1,*:*" "1,*")
+                      "UID" nil 'nouidfetch)
           (imap-message-map (lambda (uid Uid)
                               (setq minuid (if minuid (min minuid uid) uid)
                                     maxuid (if maxuid (max maxuid uid) uid)))