diff options
| author | Ulf Jasper <ulf.jasper@web.de> | 2009-02-07 13:24:06 +0000 |
|---|---|---|
| committer | Ulf Jasper <ulf.jasper@web.de> | 2009-02-07 13:24:06 +0000 |
| commit | 201af049c37b7444280b2e25d1a0d9f4d45ba7c6 (patch) | |
| tree | e07066c2eb8a2c0acaa7f3b460576da92f5776ad /lisp | |
| parent | 4470a277fef8e791c9178b3f710eaef2031918c1 (diff) | |
| download | emacs-201af049c37b7444280b2e25d1a0d9f4d45ba7c6.tar.gz emacs-201af049c37b7444280b2e25d1a0d9f4d45ba7c6.tar.bz2 emacs-201af049c37b7444280b2e25d1a0d9f4d45ba7c6.zip | |
newsticker: fix infinite recursion when moving to next new item
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 6 | ||||
| -rw-r--r-- | lisp/net/newst-treeview.el | 12 |
2 files changed, 13 insertions, 5 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 1c3db798cba..02fab5292c9 100644 --- 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 66c075d0f7d..cb70a311c55 100644 --- 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. |