newsticker: fix infinite recursion when moving to next new item

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 1c3db798cba66c401ac8a2d0acae5dff08d8c3d5..02fab5292c9202093082a64ae3f619e620da9be6 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2009-02-07  Ulf Jasper  <ulf.jasper@web.de>
+
+       * net/newst-treeview.el
+       (newsticker-treeview-next-new-or-immortal-item): New arg
+       DONT-WRAP-TREES to prevent infinite recursion.
+
 2009-02-07  Stefan Monnier  <monnier@iro.umontreal.ca>
 
        * mail/rmailedit.el (rmail-cease-edit): narrow-to-region before

diff --git a/lisp/net/newst-treeview.el b/lisp/net/newst-treeview.el
index 66c075d0f7de68f30a5f1630760ac4812206532a..cb70a311c55d6c271093c74865476000b220d602 100644 (file)
--- a/lisp/net/newst-treeview.el
+++ b/lisp/net/newst-treeview.el
@@ -7,7 +7,7 @@
 ;; URL:         http://www.nongnu.org/newsticker
 ;; Created:     2007
 ;; Keywords:    News, RSS, Atom
-;; Time-stamp:  "24. Januar 2009, 11:22:20 (ulf)"
+;; Time-stamp:  "7. Februar 2009, 11:46:00 (ulf)"
 
 ;; ======================================================================
 
@@ -1314,7 +1314,8 @@ Note: does not update the layout."
   (newsticker-treeview-show-item))
 
 (defun newsticker-treeview-next-new-or-immortal-item (&optional
-                                                      current-item-counts)
+                                                      current-item-counts
+                                                      dont-wrap-trees)
   "Move to next new or immortal item.
 Will move to next feed until an item is found.  Will not move if
 optional argument CURRENT-ITEM-COUNTS is t and current item is
@@ -1337,9 +1338,10 @@ new or immortal."
                   (newsticker-treeview-show-item)
                   (throw 'found t))
                 (setq move t))))
-    (when (or (newsticker-treeview-next-feed t)
-              (newsticker--treeview-first-feed))
-      (newsticker-treeview-next-new-or-immortal-item t))))
+    (let ((wrap-trees (not dont-wrap-trees)))
+      (when (or (newsticker-treeview-next-feed t)
+                (and wrap-trees (newsticker--treeview-first-feed)))
+        (newsticker-treeview-next-new-or-immortal-item t t)))))
 
 (defun newsticker-treeview-prev-new-or-immortal-item ()
   "Move to previous new or immortal item.