[Emacs-diffs] emacs/lisp ChangeLog net/newst-treeview.el

[Ulf Jasper]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Ulf Jasper <u11>        09/02/07 13:24:07

Modified files:
        lisp           : ChangeLog 
        lisp/net       : newst-treeview.el 

Log message:
        newsticker: fix infinite recursion when moving to next new item

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.15271&r2=1.15272
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/net/newst-treeview.el?cvsroot=emacs&r1=1.15&r2=1.16

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.15271
retrieving revision 1.15272
diff -u -b -r1.15271 -r1.15272
--- ChangeLog   7 Feb 2009 12:55:49 -0000       1.15271
+++ ChangeLog   7 Feb 2009 13:24:06 -0000       1.15272
@@ -1,3 +1,9 @@
+2009-02-07  Ulf Jasper  <address@hidden>
+
+       * 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  <address@hidden>
 
        * mail/rmailedit.el (rmail-cease-edit): narrow-to-region before

Index: net/newst-treeview.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/net/newst-treeview.el,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- net/newst-treeview.el       24 Jan 2009 10:39:36 -0000      1.15
+++ net/newst-treeview.el       7 Feb 2009 13:24:07 -0000       1.16
@@ -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 @@
   (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 @@
                   (newsticker-treeview-show-item)
                   (throw 'found t))
                 (setq move t))))
+    (let ((wrap-trees (not dont-wrap-trees)))
     (when (or (newsticker-treeview-next-feed t)
-              (newsticker--treeview-first-feed))
-      (newsticker-treeview-next-new-or-immortal-item 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.