2 files changed, 9 insertions, 1 deletions

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 1d0e36d6479..cb9888ac092 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,8 @@
+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
diff --git a/lisp/gnus/gnus-sum.el b/lisp/gnus/gnus-sum.el
index c7f80ec1512..c17f16ef212 100644
--- a/lisp/gnus/gnus-sum.el
+++ b/lisp/gnus/gnus-sum.el
@@ -11579,7 +11579,10 @@ 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)
-                    (next-single-char-property-change end 'invisible)
+                    (if (featurep 'xemacs)
+                        (or (next-single-char-property-change end 'invisible)
+                            (point-max))
+                      (next-single-char-property-change end 'invisible))
                   (while (progn
                            (end-of-line 2)
                            (and (not (eobp))