5 files changed, 86 insertions, 17 deletions

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 740a2340243..7c83b9d99de 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,43 @@
+2012-02-07  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+        * gnus-sum.el (gnus-summary-show-thread): Revert last two changes.
+
+2012-02-07  Lars Ingebrigtsen  <larsi@gnus.org>
+
+        * nnimap.el (nnimap-transform-headers): Remove unused variable.
+        (nnimap-transform-headers): Fix parsing BODYSTRUCTURE elements that
+        have newlines within the strings, and where the UID comes after the
+        BODYSTRUCTURE element (bug#10537).
+
+        * shr-color.el (shr-color-set-minimum-interval): Renamed to add prefix
+        (bug#10732).
+
+        * shr.el (shr-insert-document): Add doc string.
+        (shr-visit-file): Ditto.
+        (shr-remove-trailing-whitespace): New function.
+        (shr-insert-document): Use it to clean up trailing whitespace as the
+        final step (bug#10714).
+
+2012-02-06  Lars Ingebrigtsen  <larsi@gnus.org>
+
+        * gnus-sum.el (gnus-summary-exit-no-update): Really deaden the summary
+        buffer if `gnus-kill-summary-on-exit' is nil.
+
+2012-02-06  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+        * gnus-sum.el (gnus-summary-show-thread):
+        next-single-char-property-change may return nil in XEmacs.
+
+2012-02-06  Lars Ingebrigtsen  <larsi@gnus.org>
+
+        * gnus-sum.el (gnus-handle-ephemeral-exit): Allow exiting from Gnus
+        when just reading a single group from "without" Gnus.
+
+2012-02-06  Chong Yidong  <cyd@gnu.org>
+
+        * gnus-sum.el (gnus-summary-show-thread):
+        next-single-char-property-change never returns nil (Bug#8657).
+
 2012-02-05  Lars Ingebrigtsen  <larsi@gnus.org>
 
         * nnimap.el (nnimap-open-server): Allow switching the nnoo server
diff --git a/lisp/gnus/gnus-sum.el b/lisp/gnus/gnus-sum.el
index d0a582e2712..296f25a09f9 100644
--- a/lisp/gnus/gnus-sum.el
+++ b/lisp/gnus/gnus-sum.el
@@ -7328,9 +7328,11 @@ If FORCE (the prefix), also save the .newsrc file(s)."
         (gnus-kill-buffer gnus-original-article-buffer)
         (setq gnus-article-current nil))
       ;; Return to the group buffer.
-      (gnus-configure-windows 'group 'force)
       (if (not gnus-kill-summary-on-exit)
-          (gnus-deaden-summary)
+          (progn
+            (gnus-deaden-summary)
+            (gnus-configure-windows 'group 'force))
+        (gnus-configure-windows 'group 'force)
         (gnus-close-group group)
         (gnus-kill-buffer gnus-summary-buffer))
       (unless gnus-single-article-buffer
@@ -7352,7 +7354,7 @@ If FORCE (the prefix), also save the .newsrc file(s)."
 (defun gnus-handle-ephemeral-exit (quit-config)
   "Handle movement when leaving an ephemeral group.
 The state which existed when entering the ephemeral is reset."
-  (if (not (buffer-name (car quit-config)))
+  (if (not (buffer-live-p (car quit-config)))
       (gnus-configure-windows 'group 'force)
     (set-buffer (car quit-config))
     (unless (eq (cdr quit-config) 'group)
@@ -11579,6 +11581,7 @@ Returns nil if no thread was there to be shown."
          (beg (progn (beginning-of-line) (if (bobp) (point) (1- (point)))))
          (eoi (when end
                 (if (fboundp 'next-single-char-property-change)
+                    ;; Note: XEmacs version of n-s-c-p-c may return nil
                     (or (next-single-char-property-change end 'invisible)
                         (point-max))
                   (while (progn
diff --git a/lisp/gnus/nnimap.el b/lisp/gnus/nnimap.el
index 09cf554312b..4c75f721ff6 100644
--- a/lisp/gnus/nnimap.el
+++ b/lisp/gnus/nnimap.el
@@ -189,25 +189,32 @@ textual parts.")
 
 (defun nnimap-transform-headers ()
   (goto-char (point-min))
-  (let (article bytes lines size string)
+  (let (article lines size string)
     (block nil
       (while (not (eobp))
-        (while (not (looking-at "\\* [0-9]+ FETCH.+?UID \\([0-9]+\\)"))
+        (while (not (looking-at "\\* [0-9]+ FETCH"))
           (delete-region (point) (progn (forward-line 1) (point)))
           (when (eobp)
             (return)))
-        (setq article (match-string 1))
+        (goto-char (match-end 0))
         ;; Unfold quoted {number} strings.
-        (while (re-search-forward "[^]][ (]{\\([0-9]+\\)}\r?\n"
-                                  (1+ (line-end-position)) t)
+        (while (re-search-forward
+                "[^]][ (]{\\([0-9]+\\)}\r?\n"
+                (save-excursion
+                  (or (re-search-forward "\\* [0-9]+ FETCH" nil t)
+                      (point-max)))
+                t)
           (setq size (string-to-number (match-string 1)))
           (delete-region (+ (match-beginning 0) 2) (point))
           (setq string (buffer-substring (point) (+ (point) size)))
           (delete-region (point) (+ (point) size))
-          (insert (format "%S" string)))
-        (setq bytes (nnimap-get-length)
-              lines nil)
+          (insert (format "%S" (mm-subst-char-in-string ?\n ?\s string))))
         (beginning-of-line)
+        (setq article
+              (and (re-search-forward "UID \\([0-9]+\\)" (line-end-position)
+                                      t)
+                   (match-string 1)))
+        (setq lines nil)
         (setq size
               (and (re-search-forward "RFC822.SIZE \\([0-9]+\\)"
                                       (line-end-position)
diff --git a/lisp/gnus/shr-color.el b/lisp/gnus/shr-color.el
index e23ab57965e..7011034d242 100644
--- a/lisp/gnus/shr-color.el
+++ b/lisp/gnus/shr-color.el
@@ -267,7 +267,8 @@ Like rgb() or hsl()."
      (t
       nil))))
 
-(defun set-minimum-interval (val1 val2 min max interval &optional fixed)
+(defun shr-color-set-minimum-interval (val1 val2 min max interval
+                                            &optional fixed)
   "Set minimum interval between VAL1 and VAL2 to INTERVAL.
 The values are bound by MIN and MAX.
 If FIXED is t, then VAL1 will not be touched."
@@ -341,9 +342,9 @@ color will be adapted to be visible on BG."
                  (>= luminance-distance shr-color-visible-luminance-min))
             (list bg fg)
           ;; Not visible, try to change luminance to make them visible
-          (let ((Ls (set-minimum-interval (car bg-lab) (car fg-lab) 0 100
-                                          shr-color-visible-luminance-min
-                                          fixed-background)))
+          (let ((Ls (shr-color-set-minimum-interval
+                     (car bg-lab) (car fg-lab) 0 100
+                     shr-color-visible-luminance-min fixed-background)))
             (unless fixed-background
               (setcar bg-lab (car Ls)))
             (setcar fg-lab (cadr Ls))
diff --git a/lisp/gnus/shr.el b/lisp/gnus/shr.el
index acce7660263..deaef1d3f25 100644
--- a/lisp/gnus/shr.el
+++ b/lisp/gnus/shr.el
@@ -128,6 +128,7 @@ cid: URL as the argument.")
 ;; Public functions and commands.
 
 (defun shr-visit-file (file)
+  "Parse FILE as an HTML document, and render it in a new buffer."
   (interactive "fHTML file name: ")
   (pop-to-buffer "*html*")
   (erase-buffer)
@@ -139,12 +140,29 @@ cid: URL as the argument.")
 
 ;;;###autoload
 (defun shr-insert-document (dom)
+  "Render the parsed document DOM into the current buffer.
+DOM should be a parse tree as generated by
+`libxml-parse-html-region' or similar."
   (setq shr-content-cache nil)
-  (let ((shr-state nil)
+  (let ((start (point))
+        (shr-state nil)
         (shr-start nil)
         (shr-base nil)
         (shr-width (or shr-width (window-width))))
-    (shr-descend (shr-transform-dom dom))))
+    (shr-descend (shr-transform-dom dom))
+    (shr-remove-trailing-whitespace start (point))))
+
+(defun shr-remove-trailing-whitespace (start end)
+  (save-restriction
+    (narrow-to-region start end)
+    (delete-trailing-whitespace)
+    (goto-char start)
+    (while (not (eobp))
+      (end-of-line)
+      (dolist (overlay (overlays-at (point)))
+        (when (overlay-get overlay 'before-string)
+          (overlay-put overlay 'before-string nil)))
+      (forward-line 1))))
 
 (defun shr-copy-url ()
   "Copy the URL under point to the kill ring.