# HG changeset patch
# User Katsumi Yamaoka <yamaoka@jpl.org>
# Date 1289430961 0
# Node ID 244f248736b457a5d384d20f1b4c640771bb61f9
# Parent  3cd0a7a068d5c85558cf8006c6d42d75c785cd9d
nnimap.el (nnimap-update-info): Fix problem with `g' chopping of low-numbered articles.
message.el (message-resend): Don't disable encoding unless it's already encoded.

diff -r 3cd0a7a068d5 -r 244f248736b4 lisp/gnus/ChangeLog
--- a/lisp/gnus/ChangeLog	Wed Nov 10 23:27:02 2010 +0100
+++ b/lisp/gnus/ChangeLog	Wed Nov 10 23:16:01 2010 +0000
@@ -1,3 +1,11 @@
+2010-11-10  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+	* message.el (message-resend): Don't disable encoding unless it's
+	already encoded.
+
+	* nnimap.el (nnimap-update-info): Fix problem with `g' chopping of
+	low-numbered articles.
+
 2010-11-10  Katsumi Yamaoka  <yamaoka@jpl.org>
 
 	* rfc2047.el (rfc2047-syntax-table): Simplify.
diff -r 3cd0a7a068d5 -r 244f248736b4 lisp/gnus/message.el
--- a/lisp/gnus/message.el	Wed Nov 10 23:27:02 2010 +0100
+++ b/lisp/gnus/message.el	Wed Nov 10 23:16:01 2010 +0000
@@ -7432,7 +7432,11 @@
       (when (looking-at "From ")
 	(replace-match "X-From-Line: "))
       ;; Send it.
-      (let ((message-inhibit-body-encoding t)
+      (let ((message-inhibit-body-encoding
+	     ;; Don't do any further encoding if it looks like the
+	     ;; message has already been encoded.
+	     (let ((case-fold-search t))
+	       (re-search-forward "^mime-version:" nil t)))
 	    (message-inhibit-ecomplete t)
 	    message-required-mail-headers
 	    message-generate-hashcash
diff -r 3cd0a7a068d5 -r 244f248736b4 lisp/gnus/nnimap.el
--- a/lisp/gnus/nnimap.el	Wed Nov 10 23:27:02 2010 +0100
+++ b/lisp/gnus/nnimap.el	Wed Nov 10 23:16:01 2010 +0000
@@ -1155,13 +1155,16 @@
 		(not (gnus-active group)))
 	    (gnus-set-active group
 			     (cond
+			      (active
+			       (cons (min (or low (car active))
+					  (car active))
+				     (max (or high (cdr active))
+					  (cdr active))))
 			      ((and low high)
 			       (cons low high))
 			      (uidnext
 			       ;; No articles in this group.
 			       (cons uidnext (1- uidnext)))
-			      (active
-			       active)
 			      (start-article
 			       (cons start-article (1- start-article)))
 			      (t