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

[Ulf Jasper]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Ulf Jasper <u11>        09/01/24 10:39:36

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

Log message:
        newsticker: Fixed next-new-or-immortal-feed even more.

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

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.15165
retrieving revision 1.15166
diff -u -b -r1.15165 -r1.15166
--- ChangeLog   24 Jan 2009 10:27:03 -0000      1.15165
+++ ChangeLog   24 Jan 2009 10:39:34 -0000      1.15166
@@ -1,3 +1,11 @@
+2009-01-24  Ulf Jasper  <address@hidden>
+
+       * net/newst-treeview.el (newsticker--treeview-first-feed): New.
+       (newsticker-treeview-next-new-or-immortal-item): Try first-feed if
+       next-feed does not succeed.  Fixes bug#1710 even more.
+       (newsticker-treeview-next-feed): Simplified.
+       (newsticker--group-get-feeds): Suppress group names in result.
+
 2009-01-24  Adrian Robert  <address@hidden>
 
        * term/ns-win.el (menu-bar-select-frame): Drop this override.

Index: net/newst-treeview.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/net/newst-treeview.el,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- net/newst-treeview.el       22 Jan 2009 20:27:28 -0000      1.14
+++ net/newst-treeview.el       24 Jan 2009 10:39:36 -0000      1.15
@@ -7,7 +7,7 @@
 ;; URL:         http://www.nongnu.org/newsticker
 ;; Created:     2007
 ;; Keywords:    News, RSS, Atom
-;; Time-stamp:  "22. Januar 2009, 21:22:25 (ulf)"
+;; Time-stamp:  "24. Januar 2009, 11:22:20 (ulf)"
 
 ;; ======================================================================
 
@@ -1337,7 +1337,8 @@
                   (newsticker-treeview-show-item)
                   (throw 'found t))
                 (setq move t))))
-    (when (newsticker-treeview-next-feed t)
+    (when (or (newsticker-treeview-next-feed t)
+              (newsticker--treeview-first-feed))
       (newsticker-treeview-next-new-or-immortal-item t))))
 
 (defun newsticker-treeview-prev-new-or-immortal-item ()
@@ -1542,6 +1543,11 @@
           (node
            (widget-apply-action node)))))
 
+(defun newsticker--treeview-first-feed ()
+  "Jump to the depth-first feed in the newsticker-groups tree." 
+  (newsticker-treeview-jump
+   (car (reverse (newsticker--group-get-feeds newsticker-groups t)))))
+
 (defun newsticker-treeview-next-feed (&optional stay-in-tree)
   "Move to next feed.
 Optional argument STAY-IN-TREE prevents moving from real feed
@@ -1551,8 +1557,6 @@
   (newsticker--treeview-restore-layout)
   (let ((cur (newsticker--treeview-get-current-node))
         (new nil))
-    (if cur
-      (progn
         (setq new
               (if cur
                   (or (newsticker--treeview-get-next-sibling cur)
@@ -1565,7 +1569,6 @@
               (newsticker--treeview-activate-node new)
               (newsticker--treeview-tree-update-highlight)
               (not (eq new cur)))
-          nil))
       nil)))
 
 (defun newsticker-treeview-prev-feed (&optional stay-in-tree)
@@ -1719,7 +1722,7 @@
                   (let ((subfeeds (newsticker--group-get-feeds n t)))
                     (when subfeeds
                       (setq result (append subfeeds result)))))))
-          group)
+          (cdr group))
     result))
 
 (defun newsticker-group-add-group (name parent)