Merge branch 'no-gnus' of https://git.gnus.org/gnus into no-gnus

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index cc5ac49..2306e82 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -11,6 +11,11 @@
        * 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

diff --git a/lisp/gnus-sum.el b/lisp/gnus-sum.el
index 6fff60f..c10dbe1 100644 (file)
--- a/lisp/gnus-sum.el
+++ b/lisp/gnus-sum.el
@@ -11581,7 +11581,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))