gnus-sum.el (gnus-summary-show-thread): Revert last two changes.

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 383addc8369d79527ca74b3b5fe44d5d4c275242..7c83b9d99dea0dfd34bb7c5b4024e9f0e3747357 100644 (file)
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,7 @@
+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.

diff --git a/lisp/gnus/gnus-sum.el b/lisp/gnus/gnus-sum.el
index c10dbe1ad8b5f2ef296fac5b590276dd51fdac87..296f25a09f97fdbe634b6bf5ed531514ca4b5207 100644 (file)
--- a/lisp/gnus/gnus-sum.el
+++ b/lisp/gnus/gnus-sum.el
@@ -11581,10 +11581,9 @@ 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)
-                   (if (featurep 'xemacs)
-                       (or (next-single-char-property-change end 'invisible)
-                           (point-max))
-                     (next-single-char-property-change end 'invisible))
+                   ;; Note: XEmacs version of n-s-c-p-c may return nil
+                   (or (next-single-char-property-change end 'invisible)
+                       (point-max))
                  (while (progn
                           (end-of-line 2)
                           (and (not (eobp))